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: .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 +++++
 1 file changed, 5 insertions(+)

(limited to '.mailmap')

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>
-- 
cgit v1.2.3