.mailmap: update (of June)

Change-Id: Ibd558c7030cb39e7978a05b5ba633303ed0ea046
Reviewed-on: https://code.wireshark.org/review/22033
Reviewed-by: Jeroen Sack <jsack@lely.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

diff --git a/.mailmap b/.mailmap
index a8d4cc1a9737c6a21a77972ad7882ee2e64fa985..3ee29149b24d897143eaa9711844e719101935cc 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -66,6 +66,7 @@ Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl>
 Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com>
 Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com>
 Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.com>
+Jeroen Sack <jeroen@jeroensack.nl> Jeroen Sack <jsack@lely.com>
 Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com>
 Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com>
 João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt>
@@ -117,6 +118,8 @@ Pratik Yeole <pyeole@ncsu.edu> Pyeole <pyeole@ncsu.edu>
 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> Richard Sharpe <richard.sharpe@primarydata.com>
+Richard Sharpe <realrichardsharpe@gmail.com> Richard Sharpe <rsharpe@samba.org>
 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
@@ -130,6 +133,7 @@ Sanket Godbole <sanket.godbole@spirent.com> sangodbole <sanket.godbole@spirent.c
 Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>
 Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
 Shuai Xiao <iamhihi@gmail.com> shuai xiao <iamhihi@gmail.com>
+Simon Barber <simon.barber@meraki.net> Simon Barber <sbarber@parc.com>
 Simon Zhong <szhong.jnpr@gmail.com> szhong <szhong.jnpr@gmail.com>
 Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org>
 Stephen Donnelly <stephen@endace.com> sfd <stephen.donnelly@emulex.com>
@@ -152,3 +156,4 @@ Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com>
 Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com>
 Yang Luo <hsluoyz@qq.com> Yang Luo <hsluoyz@gmail.com>
 Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>
+Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com>

diff --git a/AUTHORS b/AUTHORS
index ddbf0598db64588b47bb45378771fe96f3dfe041..e7bccce48b96a3ab33418a52439d95c4fed335b5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4163,8 +4163,7 @@ Jeffrey Smith             <whydoubt[AT]gmail.com>
 Jens Kilian            <jens.kilian[AT]advantest.com>
 Jeremy Hitt            <jeremy.hitt[AT]isilon.com>
 Jeroen Roovers         <jer[AT]gentoo.org>
-Jeroen Sack            <jeroen[AT]jeroensack.nl>
-Jeroen Sack            <jsack[AT]lely.com>
+Jeroen Sack            <jeroen@jeroensack.nl>
 Jesse Gross            <jesse[AT]kernel.org>
 Jim Schaettle          <jimschaettle[AT]gmail.com>
 Jim Young              <jyoung[AT]gsu.edu>
@@ -4316,8 +4315,6 @@ Remi Gacogne              <remi.gacogne[AT]powerdns.com>
 Ricardo Cristian Ramirez <r.cristian.ramirez[AT]gmail.com>
 Rich Coe               <richcoe2[AT]gmail.com>
 Richard Kuemmel                <kuemmel.ric[AT]googlemail.com>
-Richard Sharpe         <richard.sharpe[AT]primarydata.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]gmail.com>
@@ -4351,7 +4348,6 @@ Shoichi Sakane            <wireshark-shoichi[AT]tanu.org>
 Shu Shen               <shu.shen[AT]gmail.com>
 Shuai Xiao             <iamhihi[AT]gmail.com>
 Silvio Gissi           <silvio.gissi[AT]gmail.com>
-Simon Barber           <sbarber[AT]parc.com>
 Simon Barber           <simon.barber[AT]meraki.net>
 Simon Zhong            <szhong.jnpr[AT]gmail.com>
 Slava Shwartsman       <slavash[AT]mellanox.com>
@@ -4418,11 +4414,11 @@ Yann Lejeune            <ylejeune[AT]netyl.org>
 Yasuyuki Tanaka                <yatch[AT]isl.rdc.toshiba.co.jp>
 Yurii Lysyi            <yurii.lysyi[AT]ericsson.com>
 Zdeněk Žamberský    <zzdevel[AT]seznam.cz>
+Zhao Lin               <zlbinghamton[AT]gmail.com>
 anonsvn                        <anonsvn[AT]localhost>
 cff339                 <cff339[AT]gmail.com>
 kardam                 <netkardam[AT]gmail.com>
 kkoizumi               <kkoizumi46[AT]gmail.com>
-linzhao115             <zlbinghamton[AT]gmail.com>
 Éric Piel             <piel[AT]delmic.com>
 Øyvind Rønningstad   <ronningstad[AT]gmail.com>
 Дмитрий Цветцих          <dmitrycvet[AT]gmail.com>