From fc690a67817eab7ce519e2ac43dde9c8e41d1d43 Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Thu, 17 Mar 2016 09:35:38 +0100
Subject: Update .mailmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie6b9c0fabc31187a81bc3b41001fd558f69e062f
Reviewed-on: https://code.wireshark.org/review/14500
Reviewed-by: Daniël van Eeden <wireshark@myname.nl>
Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
---
 .mailmap | 5 ++++-
 AUTHORS  | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index 4b5c566120..54dde70d52 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,4 @@
-Adrian Simionov <daniel.simionov@gmail.com> AdrianSimionov <daniel.simionov@gmail.com>
+Adrian Simionov <daniel.simionov@gmail.com> <daniel.simionov@gmail.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
@@ -17,6 +17,7 @@ Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org>
 Christoph Jähnigen <nuabaranda@web.de> desolat <nuabaranda@web.de>
 Claudius Zingerli <czingerl@gmail.com> zeuz <czingerl@gmail.com>
 Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden
+Daniël van Eeden <wireshark@myname.nl> <git@myname.nl>
 Dave Tapuska <dtapuska@google.com> dave@tapuska.com>
 David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
 Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
@@ -64,6 +65,7 @@ Martin Kaiser <wireshark@kaiser.cx> <martin@skogar.kaiser.cx>
 Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens
 Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens <martin.tibensky@alcatel-lucent.com>
 Martin Tibenský <martin.tibensky@alcatel-lucent.com> <tibensky233@gmail.com>
+Matthieu Coudron <matthieu.coudron@lip6.fr> <mattator@gmail.com>
 Michael Oed <michael.oed@gmail.com> Mike78 <michael.oed@gmail.com>
 Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de>
 Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
@@ -84,6 +86,7 @@ Qiaoyin Yang <qiaoyin.yang@gmail.com> <qiaoyin.yang[AT]gmail.com>
 Remi Vichery <remi.vichery@gmail.com>
 Richard Kuemmel <kuemmel.ric@googlemail.com> richardk <kuemmel.ric@googlemail.com>
 Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com>
+Robert Cragie <robert.cragie@gmail.com> Robert Cragie <robert.cragie@arm.com>
 Robert Grange <robionekenobi@bluewin.ch> robioneknobi
 Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
 Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
diff --git a/AUTHORS b/AUTHORS
index e5b6f90d43..9eec00abd9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3933,7 +3933,6 @@ Adam Goldman		<adam.goldman[AT]intel.com>
 Adam Pridgen		<adam.pridgen[AT]thecoverofnight.com>
 Adam Schwalm		<adam.schwalm[AT]dynetics.com>
 Aditya Jain		<aditya.jain[AT]samsung.com>
-Adrian			<daniel.simionov[AT]gmail.com>
 Adrian Simionov		<daniel.simionov[AT]gmail.com>
 Adrian-Ken Rueegsegger	<ken[AT]codelabs.ch>
 Alan Partis		<alpartis[AT]thundernet.com>
@@ -3995,7 +3994,6 @@ Cédric Delmas		<cedricde[AT]outlook.fr>
 D. Ulis			<daulis0[AT]gmail.com>
 Daniel Mack		<daniel[AT]zonque.org>
 Daniel Stenberg		<daniel[AT]haxx.se>
-Daniël van Eeden	<git[AT]myname.nl>
 Daniël van Eeden	<wireshark[AT]myname.nl>
 Darshan Nevgi		<darshan.sn[AT]samsung.com>
 Dave Rigby		<daver[AT]couchbase.com>
@@ -4094,7 +4092,7 @@ MarkPhillips		<mark.s.phillips[AT]outlook.com>
 Marko Hrastovec		<marko.hrastovec[AT]gmail.com>
 Martin Tibenský		<martin.tibensky[AT]alcatel-lucent.com>
 Matej Košík		<5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
-Matthieu Coudron	<mattator[AT]gmail.com>
+Matthieu Coudron	<matthieu.coudron[AT]lip6.fr>
 Micha Reiser		<michafamreiser.ch>
 Michael Adam		<obnox[AT]samba.org>
 Michael McConville	<mmcco[AT]mykolab.com>
@@ -4155,7 +4153,6 @@ Richard Kuemmel		<kuemmel.ric[AT]googlemail.com>
 Richard Sharpe		<rsharpe[AT]samba.org>
 Rishi Dev Singh		<rishi.dev[AT]samsung.com>
 Robert Beardsworth	<rob_beardsworth[AT]hotmail.com>
-Robert Cragie		<robert.cragie[AT]arm.com>
 Robert Cragie		<robert.cragie[AT]gmail.com>
 Robert P		<tehownt[AT]gmail.com>
 Roland Knall		<rknall[AT]gmail.com>
-- 
cgit v1.2.3