From 6311657ff9104b517bde3c079d4bff3066ba9321 Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Sun, 11 Dec 2016 21:32:55 +0100
Subject: .mailmap: Update (of december)

Change-Id: Id96ce391b9957ac37705c503bea35395ee3d358d
Reviewed-on: https://code.wireshark.org/review/19207
Reviewed-by: Paul Williamson <paul@mustbeart.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 AUTHORS | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 7569de215f..0c6e191fcd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4010,6 +4010,7 @@ Birol Capa		<birol.capa[AT]siemens.com>
 Boris Bochkarev		<Boris-Bochkaryov[AT]yandex.ru>
 Bradford Boyle		<bradford.d.boyle[AT]gmail.com>
 Branislav Makan		<branislav.makan1994[AT]gmail.com>
+Brian Whitney		<brian.m.whitney[AT]outlook.com>
 Britt McKinley		<bmckinley[AT]sonusnet.com>
 Bruno Verstuyft		<bruno.verstuyft[AT]excentis.com>
 Carlos Velasco		<carlos.velasco[AT]nimastelecom.com>
@@ -4210,7 +4211,6 @@ Miltos Patsiouras	<mipatsio[AT]gmail.com>
 Mirko Parthey		<mirko.parthey[AT]web.de>
 Moraney Jalil		<moraney.jalil[AT]outlook.com>
 Moshe Kaplan		<me[AT]moshekaplan.com>
-MustBeArt		<paul[AT]mustbeart.com>
 Nathan Cole		<nath[AT]thecoleresidence.co.uk>
 Nick Bedbury		<npbedbur[AT]syr.edu>
 Nick Carter		<ncarter100[AT]gmail.com>
@@ -4235,6 +4235,7 @@ Patrick MacArthur	<pmacarth[AT]iol.unh.edu>
 Patrick Servello	<patrick.servello[AT]gmail.com>
 Paul Emge		<paul.emge[AT]digidescorp.com>
 Paul Offord		<paul.offord[AT]advance7.com>
+Paul Williamson		<paul[AT]mustbeart.com>
 Paulo Roberto Brandão	<betobrandao[AT]gmail.com>
 Pavel Karneliuk		<pavel_karneliuk[AT]epam.com>
 Pavel Moravec		<mgr.pavel[AT]gmail.com>
@@ -4354,11 +4355,9 @@ Yang Luo		<hsluoyz[AT]qq.com>
 Yann Diorcet		<yann[AT]diorcet.fr>
 Yann Lejeune		<ylejeune[AT]netyl.org>
 Yasuyuki Tanaka		<yatch[AT]isl.rdc.toshiba.co.jp>
-Your Name		<you[AT]example.com>
 Yurii Lysyi		<yurii.lysyi[AT]ericsson.com>
 Zdeněk Žamberský	<zzdevel[AT]seznam.cz>
 anonsvn			<anonsvn[AT]localhost>
-bwhitn			<brian.m.whitney[AT]outlook.com>
 cff339			<cff339[AT]gmail.com>
 kardam			<netkardam[AT]gmail.com>
 kkoizumi		<kkoizumi46[AT]gmail.com>
-- 
cgit v1.2.1