Merge "update mailmap"

2013-05-23 19:45:39 +00:00 · 2013-05-23 19:45:39 +00:00 · 80d8fd6222
parent 1e57943840 3ce8ba5e9d
commit 80d8fd6222
1 changed files with 1 additions and 0 deletions
--- a/.mailmap
+++ b/.mailmap
@ -2,3 +2,4 @@
 # <preferred e-mail> <other e-mail 1>
 # <preferred e-mail> <other e-mail 2>
 Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
+Jiajun Liu <jiajun@unitedstack.com> <iamljj@gmail.com>