From 8f86a3b6cb5873bccd5c71ca2791146cde74313d Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Mon, 12 Mar 2018 20:27:35 +0100
Subject: [PATCH] .mailamp: update (of Q1 2018)

Change-Id: Ia4192832071d6c4cd707cdbcafcfa805bdf5394b
Reviewed-on: https://code.wireshark.org/review/26450
Reviewed-by: Andreas Schultz <andreas.schultz@travelping.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 .mailmap | 5 +++++
 AUTHORS  | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index ba09fc2d7d..46c0240ba8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ Anders Broman <anders.broman@ericsson.com> <a.broman58@gmail.com>
 Anders Broman <anders.broman@ericsson.com> <a.broman@bredband.net>
 Anders Broman <anders.broman@ericsson.com> Anders <anders.broman@ericsson.com>
 Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com>
+Andreas Schultz <andreas.schultz@travelping.com>  Andreas Schultz  <aschultz@warp10.net>
 Andy Ling <andy.ling@s-a-m.com> AndyL <andy.ling@s-a-m.com>
 Anil Kumar K K <anilkumar911@gmail.com> anilkumar911 <anilkumar911@gmail.com>
 Anish <anish@chelsio.com> Anish Bhatt <anish@gatech.edu>
@@ -34,6 +35,7 @@ Daniël van Eeden <wireshark@myname.nl> <git@myname.nl>
 Darien Spencer <cusneud@mail.com> DarienSpencer65 <cusneud@mail.com>
 Dario Lombardo <lomato@gmail.com> dario <lomato@gmail.com>
 Dave Tapuska <dtapuska@google.com> dave@tapuska.com
+David Aggeler <david_aggeler@yahoo.com> david-aggeler <david_aggeler@yahoo.com>
 David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
 David Zoller <zollerd@gmail.com> dz-msfc <zollerd@gmail.com>
 Deep Datta <ddatta@ixiacom.com> Deep Datta <deepdatta2010@yahoo.co.in>
@@ -43,6 +45,7 @@ Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
 Dirk Jagdmann <doj@cubic.org> Dirk <doj@cubic.org>
 Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
 Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
+Ed Beroset <beroset@ieee.org> Ed Beroset <beroset@mindspring.com>
 Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
 Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
 Eugene Adell <eugene.adell@d2-si.eu> Eugene Adell <eugene.adell@gmail.com>
@@ -95,6 +98,7 @@ Marcel Essig <marcel.essig@gmx.de> <essig.marcel@gmail.com>
 Marian Ďurkovič <md@bts.sk> Marian Durkovic
 Marius Paliga <marius.paliga@gmail.com> Marius <mareko.paliga@gmail.com>
 Marius Paliga <marius.paliga@gmail.com> Marius Paliga <mareko.paliga@gmail.com>
+Mark Ciechanowski <markciechanowski@gmail.com> ciechanowski <markciechanowski@gmail.com>
 Mark Phillips <mark.s.phillips@outlook.com> Mark Phillips <mark.phil@samsung.com>
 Mark Phillips <mark.s.phillips@outlook.com> MarkPhillips <mark.s.phillips@outlook.com>
 Martin Kaiser <wireshark@kaiser.cx> <martin.kaiser@paytec.ch>
@@ -138,6 +142,7 @@ Robert Grange <robionekenobi@bluewin.ch> robioneknobi
 Ronen Boazi <ronen.boazi@intel.com> Boazi <ronen.boazi@intel.com>
 Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
 Rudra Rugge  <rrugge@juniper.net> Rudra Rugge <rudrarugge@gmail.com>
+Rui ZHANG <rzhang@grandstream.cn> ZHANG Rui <rzhang@grandstream.cn>
 Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
 Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
 Samiran Saha <ssahasamiran@gmail.com> samsaha <ssahasamiran@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index cb0a59a9d4..63654b1755 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3995,7 +3995,6 @@ Andre Puschmann		<andre[AT]softwareradiosystems.com>
 Andreas Gruenbacher	<andreas.gruenbacher[AT]gmail.com>
 Andreas Leibold		<andreas.leibold[AT]harman.com>
 Andreas Schultz		<andreas.schultz[AT]travelping.com>
-Andreas Schultz		<aschultz[AT]warp10.net>
 Andreas Stieger		<andreas.stieger[AT]gmx.de>
 Andreas Urke		<arurke[AT]netwurke.com>
 Andrei Cipu		<acipu[AT]ixiacom.com>
@@ -4088,6 +4087,7 @@ Dave Goodell		<dave[AT]goodell.io>
 Dave Pifke		<dave[AT]pifke.org>
 Dave Rigby		<daver[AT]couchbase.com>
 Dave Tapuska		<dtapuska[AT]google.com>
+David Aggeler		<david_aggeler[AT]yahoo.com>
 David Ameiss		<david[AT]ameissnet.com>
 David Arnold		<d[AT]0x1.org>
 David Barrera		<davidbb[AT]gmail.com>
@@ -4279,6 +4279,7 @@ Marcin Rokicki		<marcin.rokicki[AT]gmail.com>
 Marian Ďurkovič		<md[AT]bts.sk>
 Marie Janssen		<jamuraa[AT]google.com>
 Marius Paliga		<marius.paliga[AT]gmail.com>
+Mark Ciechanowski	<markciechanowski[AT]gmail.com>
 Mark Cunningham		<launchpad[AT]markcunningham.ie>
 Mark Phillips		<mark.s.phillips[AT]outlook.com>
 Mark Weel		<markweel[AT]hotmail.com>
@@ -4401,6 +4402,7 @@ Roman Leonhartsberger	<ro.leonhartsberger[AT]gmail.com>
 Roman Volkov		<volkoff_roman[AT]ukr.net>
 Ronen Boazi		<ronen.boazi[AT]intel.com>
 Rudra Rugge		<rrugge[AT]juniper.net>
+Rui ZHANG		<rzhang[AT]grandstream.cn>
 Russel Howe		<russel[AT]appliedinvention.com>
 Russell Lowes		<russelll[AT]metamako.com>
 Rustam Safargalin	<rustam.safargalin[AT]sifox.ru>
@@ -4504,14 +4506,11 @@ Yann Lejeune		<ylejeune[AT]netyl.org>
 Yasuyuki Tanaka		<yatch1.tanaka[AT]toshiba.co.jp>
 Yurii Lysyi		<yurii.lysyi[AT]ericsson.com>
 Yury Gargay		<yury.gargay[AT]gmail.com>
-ZHANG Rui		<rzhang[AT]grandstream.cn>
 Zdeněk Žamberský	<zzdevel[AT]seznam.cz>
 Zhao Lin		<zlbinghamton[AT]gmail.com>
 anonsvn			<anonsvn[AT]localhost>
 cff339			<cff339[AT]gmail.com>
 cheloftus		<cheloftus[AT]gmail.com>
-ciechanowski		<markciechanowski[AT]gmail.com>
-david-aggeler		<david_aggeler[AT]yahoo.com>
 kardam			<netkardam[AT]gmail.com>
 kkoizumi		<kkoizumi46[AT]gmail.com>
 shqking			<shqking[AT]gmail.com>