Merge pull request #3906 from dachary/wip-mailmap

mailmap: David Zhang affiliation

Reviewed-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
This commit is contained in:
Loic Dachary 2015-03-09 13:28:17 +01:00
commit e84bc508dc
2 changed files with 2 additions and 1 deletions

View File

@ -45,6 +45,7 @@ Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
Dan Mick <dmick@redhat.com> <dan.mick@redhat.com>
Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>

View File

@ -316,7 +316,7 @@ Whatever <contact@whatever-company.com> Sylvain Munaut <s.munaut@whatever-compan
Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
Yahoo! <contact@yahoo-inc.com> David Zhang <david.z1003@yahoo.com>
Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
Yahoo! <contact@yahoo-inc.com> Lei Dong <leidong@yahoo-inc.com>