From 4b9e481665b3c28c5730a8297ec984562f4a1728 Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Tue, 4 Apr 2017 21:23:34 +0200
Subject: .mailmap: update (of April)

Change-Id: I74bf31ad4772966a292dde7a73a97d172c5121aa
Reviewed-on: https://code.wireshark.org/review/20909
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 5dfbf250c8..0a8c478ed8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -29,6 +29,7 @@ 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>
 Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
+Dhiru Kholia <kholia@kth.se> Dhiru Kholia <dhiru.kholia@gmail.com>
 Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
 Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
 Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
@@ -60,6 +61,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>
+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>
 John Miner <optommp@gmail.com> John <optommp@gmail.com>
-- 
cgit v1.2.3