From 336b56b3fce850ba8ac006a2509edbed4e3d440e Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Fri, 15 Jun 2018 11:20:48 +0000
Subject: .mailmap: update of June (2018)

Change-Id: I5dbebce0dd27c6f6867db61e6b0b0aa6b0d3e36f
Reviewed-on: https://code.wireshark.org/review/28285
Reviewed-by: Disha <ddaniel@empirix.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 0050bae7ea..06e1568083 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,6 +40,7 @@ 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 Bastiani <daveb64@yahoo.com>Dave B <daveb64@yahoo.com>
 David Zoller <zollerd@gmail.com> dz-msfc <zollerd@gmail.com>
 Deep Datta <ddatta@ixiacom.com> Deep Datta <deepdatta2010@yahoo.co.in>
 Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
@@ -47,6 +48,7 @@ Dhiru Kholia <kholia@kth.se> Dhiru Kholia <dhiru.kholia@gmail.com>
 Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
 Dirk Jagdmann <doj@cubic.org> Dirk <doj@cubic.org>
 Dirk Römmen <dirk.roemmen@cslab.de> Dirk Römmen <dro@cslab.de>
+Disha Daniel <ddaniel@empirix.com> dishadaniel <ddaniel@empirix.com>
 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>
-- 
cgit v1.2.3