aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-08-28 06:34:21 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2017-09-10 13:01:15 +0000
commit80351694c168795e08259a8f63e143c50c5a7bd4 (patch)
treefe4d5962885d566d149437309089b6ede0327c02 /.mailmap
parentc6e3fe5957f6df20d17db9dd95cb4bde80304086 (diff)
.mailmap: update (of August)
Change-Id: I77d50bedf1cb78e84c551413db8dab9223f45ed7 Reviewed-on: https://code.wireshark.org/review/23254 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 8abc53432f..16ef6e7942 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
Adrian Simionov <daniel.simionov@gmail.com> <daniel.simionov@gmail.com>
+Ahmad Fatoum <ahmad@a3f.at> Ahmad Fatoum <ahmad.fatoum@siemens.com>
Alan Partis <alpartis@thundernet.com> alpartis <alpartis@thundernet.com>
Alexander Gärtner <sphinxs1988@googlemail.com> alage <sphinxs1988@googlemail.com>
Alexander Wetzel <alexander.wetzel@web.de> deagol