Merge "Update mailmap"

2013-08-23 01:29:36 +00:00 · 2013-08-23 01:29:36 +00:00 · dd55f7e91a
commit dd55f7e91a
parent de5a24683b d0619bc645
1 changed files with 1 additions and 0 deletions
--- a/.mailmap
+++ b/.mailmap
@ -17,3 +17,4 @@ Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <nsokolov@griddynami
 Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <chemikadze@gmail.com>
 <jake@ansolabs.com> <admin@jakedahn.com>
 <jeblair@hp.com> <james.blair@rackspace.com>
+zhangguoqing <zhangguoqingas@gmail.com> <zhangguoqing@windawn.com>