From e14f1ad37ded19188e864b82ed236b1eb11eebf3 Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Fri, 6 Oct 2017 08:08:30 +0200
Subject: .mailmap: update (of October)

Change-Id: I3b8d693c288edd61ec1bd9e9161919ac3ab35f52
Reviewed-on: https://code.wireshark.org/review/23850
Reviewed-by: Florian Fainelli
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 16ef6e7942..f11756321e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,7 @@ Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark
 Boris Bochkarev <Boris-Bochkaryov@yandex.ru> boris.bochkarev <Boris-Bochkaryov@yandex.ru>
 Brian Whitney <brian.m.whitney@outlook.com> bwhitn <brian.m.whitney@outlook.com>
 Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
+Cal Turney <cturney@charter.net> Cal Turney <cturney111@gmail.com>
 Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
 Cedric Izoard <cedric.izoard@ceva-dsp.com> Cedric Izoard <cedric.izoard@rivierawaves.com>
 Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
@@ -44,8 +45,10 @@ Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
 Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
 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>
 Eugene Exarevsky <eugene.exarevsky@dsr-company.com> dsrsupport <eugene.exarevsky@dsr-company.com>
 Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
+Florian Fainelli <florian@openwrt.org> Florian Fainelli <f.fainelli@gmail.com>
 Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com>
 Francisco Javier Sánchez-Roselly <franciscojavier.sanchezroselly@ujaen.es> franciscojavier.sanchezroselly <franciscojavier.sanchezroselly@ujaen.es>
 Franklin Mathieu <franklinmathieu@gmail.com> Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
@@ -119,6 +122,7 @@ Oliver Downard <oliver.downard@couchbase.com> olivermd <oliver.downard@couchbase
 Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
 Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com>
 Paul Williamson <paul@mustbeart.com> MustBeArt<paul@mustbeart.com>
+Pavel Strnad <strnadp@tiscali.cz> Pavel Strnad <pavel_strnad@hotmail.com>
 Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>
 Peter Wu <peter@lekensteyn.nl> <lekensteyn@gmail.com>
 Petr Gotthard <petr.gotthard@honeywell.com> Petr Gotthard <petr.gotthard@centrum.cz>
-- 
cgit v1.2.3