aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-11-13 08:16:07 +0100
committerAnders Broman <a.broman58@gmail.com>2017-11-18 07:36:17 +0000
commitd8e2bee9ea84ec5123d2023f32c0f0d191834d32 (patch)
treef0d215b1dcb4cf12d1dc08172a898b88848639c0
parent925214a3e750eefb62630cf68e168c31b014fd72 (diff)
.mailmap: update (of November)
Change-Id: Ia42fe05bbc250944441576a3b7894839f4fe6ed2 Reviewed-on: https://code.wireshark.org/review/24452 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index f11756321e..ba09fc2d7d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -147,6 +147,7 @@ Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
Shuai Xiao <iamhihi@gmail.com> shuai xiao <iamhihi@gmail.com>
Simon Barber <simon.barber@meraki.net> Simon Barber <sbarber@parc.com>
Simon Zhong <szhong.jnpr@gmail.com> szhong <szhong.jnpr@gmail.com>
+Stefan Battmer <stefan.battmer@matrix-vision.de> bat <stefan.battmer@matrix-vision.de>
Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org>
Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@emulex.com>
Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@endace.com>
diff --git a/AUTHORS b/AUTHORS
index 0fd1137bc2..6b9962a9bd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4394,6 +4394,7 @@ Slava Shwartsman <slavash[AT]mellanox.com>
Sontol Bonggol <sonbonggol[AT]gmail.com>
Soumya Koduri <skoduri[AT]redhat.com>
Steev Klimaszewski <threeway[AT]gmail.com>
+Stefan Battmer <stefan.battmer[AT]matrix-vision.de>
Stefan Doehla <stefan.doehla[AT]iis.fraunhofer.de>
Stefan Hajnoczi <stefanha[AT]redhat.com>
Stefan Pöschel <github[AT]basicmaster.de>
@@ -4462,7 +4463,6 @@ Yury Gargay <yury.gargay[AT]gmail.com>
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
Zhao Lin <zlbinghamton[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
-bat <stefan.battmer[AT]matrix-vision.de>
cff339 <cff339[AT]gmail.com>
cheloftus <cheloftus[AT]gmail.com>
kardam <netkardam[AT]gmail.com>