aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 54dde70d52..87e13bc6e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,4 +102,5 @@ Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>
Warren Moxam <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com>
+Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>
diff --git a/AUTHORS b/AUTHORS
index 128f6eb563..b87d9c0ccc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4222,13 +4222,13 @@ Weston Schmidt <weston_schmidt[AT]alumni.purdue.edu>
Xavier Brouckaert <xabrouck[AT]cisco.com>
YFdyh000 <yfdyh000[AT]gmail.com>
Yan Burman <yanb[AT]mellanox.com>
+Yang Luo <hsluoyz[AT]qq.com>
Yann Lejeune <ylejeune[AT]netyl.org>
Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp>
anilkumar911 <anilkumar911[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
dsrsupport <eugene.exarevsky[AT]dsr-company.com>
-hsluoyz <hsluoyz[AT]qq.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>