From 1c3d85d577d3820486df2c9ebee687301f5c812b Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Mon, 20 Feb 2017 14:14:43 +0000
Subject: .mailmap: Update (of February and March)

Change-Id: Ib728c6ebf0a029e7241a042a0ca80c602df8e89e
Reviewed-on: https://code.wireshark.org/review/20202
Reviewed-by: Mark Phillips <mark.phil@samsung.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 AUTHORS | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 0a0e0c1980..ed273e6e1e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4014,7 +4014,6 @@ Benoit Grange		<benoit.grange[AT]gmail.com>
 Bertrand Bonnefoy-Claudet <bertrandbc[AT]gmail.com>
 Binh Trinh		<beango[AT]gmail.com>
 Birol Capa		<birol.capa[AT]siemens.com>
-Boazi			<ronen.boazi[AT]intel.com>
 Boris Bochkarev		<Boris-Bochkaryov[AT]yandex.ru>
 Bradford Boyle		<bradford.d.boyle[AT]gmail.com>
 Branislav Makan		<branislav.makan1994[AT]gmail.com>
@@ -4102,7 +4101,6 @@ Francois-Xavier Le Bail	<fx.lebail[AT]yahoo.com>
 Frank Carpenter		<frank.carpenter[AT]spectralink.com>
 Franklin Mathieu	<franklinmathieu[AT]gmail.com>
 Gabriel Ganne		<gabriel.ganne[AT]enea.com>
-Gabriel Ganne		<gabriel.ganne[AT]qosmos.com>
 Ganesh Nawsupe		<ganesh991[AT]gmail.com>
 Garming Sam		<garming[AT]catalyst.net.nz>
 Gene Cumm		<gene.cumm[AT]gmail.com>
@@ -4201,9 +4199,8 @@ Marcin Rokicki		<marcin.rokicki[AT]gmail.com>
 Marian Ďurkovič		<md[AT]bts.sk>
 Marius			<mareko.paliga[AT]gmail.com>
 Mark Cunningham		<launchpad[AT]markcunningham.ie>
-Mark Phillips		<mark.phil[AT]samsung.com>
+Mark Phillips		<mark.s.phillips[AT]outlook.com>
 Mark Weel		<markweel[AT]hotmail.com>
-MarkPhillips		<mark.s.phillips[AT]outlook.com>
 Marko Hrastovec		<marko.hrastovec[AT]gmail.com>
 Martin Tibenský		<martin.tibensky[AT]alcatel-lucent.com>
 Martin Vit		<martin[AT]voipmonitor.org>
@@ -4292,6 +4289,7 @@ Robert P		<tehownt[AT]gmail.com>
 Roland Knall		<rknall[AT]gmail.com>
 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>
 Russel Howe		<russel[AT]appliedinvention.com>
 Rustam Safargalin	<rustam.safargalin[AT]sifox.ru>
@@ -4326,7 +4324,6 @@ Stefan Völkel		<sv[AT]its-v.de>
 Stella Randall		<stella.randall[AT]emeerson.com>
 Stephan Kappertz	<octopus.sk[AT]googlemail.com>
 Stephane Bryant		<stephane.ml.bryant[AT]gmail.com>
-Stephen Donnelly	<stephen.donnelly[AT]emulex.com>
 Sunil Mushran		<sunil.mushran[AT]oracle.com>
 Sven Eckelmann		<sven[AT]open-mesh.com>
 Sven Schnelle		<svens[AT]stackframe.org>
@@ -4383,7 +4380,6 @@ anonsvn			<anonsvn[AT]localhost>
 cff339			<cff339[AT]gmail.com>
 kardam			<netkardam[AT]gmail.com>
 kkoizumi		<kkoizumi46[AT]gmail.com>
-sfd			<stephen.donnelly[AT]endace.com>
 Éric Piel		<piel[AT]delmic.com>
 Øyvind Rønningstad	<ronningstad[AT]gmail.com>
 Дмитрий Цветцих		<dmitrycvet[AT]gmail.com>
-- 
cgit v1.2.1