aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 3ee29149b2..e262de66f6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -71,6 +71,7 @@ Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com>
Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com>
João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt>
John Miner <optommp@gmail.com> John <optommp@gmail.com>
+Jonathan Muñoz <jonathan.munoz@inria.fr>
Jorge Power <jpower@rsscorp.org> jorge power
Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de>
Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de>
@@ -156,4 +157,5 @@ Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com>
Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com>
Yang Luo <hsluoyz@qq.com> Yang Luo <hsluoyz@gmail.com>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>
+Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> <yatch@isl.rdc.toshiba.co.jp>
Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com>