From feb510df69f56eb1c5662375518bd5138d6cd1c8 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sun, 16 Jul 2017 10:50:19 +0200
Subject: .mailmap: fix duplicates and regenerate AUTHORS

Change-Id: I1332c63d59edf5b2a2ac8fe605d6f15cf6afa4ae
Reviewed-on: https://code.wireshark.org/review/22638
Reviewed-by: Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp>
Reviewed-by: Jonathan M Munoz S <jonathan.munoz@inria.fr>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 3ee29149b2..e262de66f6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -71,6 +71,7 @@ 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>
+Jonathan Muñoz <jonathan.munoz@inria.fr>
 Jorge Power <jpower@rsscorp.org> jorge power
 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>
@@ -156,4 +157,5 @@ 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>
+Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> <yatch@isl.rdc.toshiba.co.jp>
 Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com>
-- 
cgit v1.2.1