summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-07-05 10:23:52 -0300
committerMarcel Holtmann <marcel@holtmann.org>2010-07-05 10:23:52 -0300
commite95ccfff9715574cd22ac0830688c371515347cb (patch)
tree3316d94c1967c6e257deaf7ce82cfef6e56ab7e9 /.mailmap
parente38f83480779086a653c357b16e2ffc28826032d (diff)
downloadofono-e95ccfff9715574cd22ac0830688c371515347cb.tar.bz2
Update .mailmap rules
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 904d8f26..dbb0fcbe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,2 @@
-Luiz Augusto von Dentz <luiz.dentz-von@nokia.com> Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com>
+Luiz Augusto von Dentz <luiz.dentz-von@nokia.com> <luiz.dentz-von@nokia.com>
+Zhenhua Zhang <zhenhua.zhang@intel.com> <zhenhua.zhang@intel.com>