From d40b40d0549679f95ca968555e9250122a109fe6 Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Sun, 5 Jun 2016 21:11:51 +0200
Subject: Update .mailmap: fix duplicate entry or name typo

Change-Id: I72ad4ba629af55b54c10d5623018aef65a9eac0e
Reviewed-on: https://code.wireshark.org/review/15744
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 87e13bc6e1..5705dd3912 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,6 +53,7 @@ Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de>
 Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de>
 Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com>
 Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com>
+Juan Pablo Mendoza <jpablo@gmail.com> jpmendoza <jpablo@gmail.com>
 Kary Rogers <kary.rogers@gmail.com> karyrogers <kary.rogers@gmail.com>
 Krishna Chaitanya <chaitanya.mgit@gmail.com> tkc <chaitanya.mgit@gmail.com>
 Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.co.at>
@@ -99,8 +100,11 @@ Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org>
 Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.com>
 Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
 Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
+Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
+Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>
 Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>
 Warren Moxam <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
 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>
-- 
cgit v1.2.3