From 8556b9d5330824e4849e8ebb0a3426f519bea1ab Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Sat, 6 Feb 2016 01:09:11 +0100
Subject: [PATCH] mailmap: further cleanup.

Somehow a followup to #581c65dd48807a516b43adec4b5be29c040db8c7

Work was half-done, and mailmap can be further simplified without changing outpout of the script credits.sh

Signed-off-by: Yann Dupont <yann@objoo.org>
---
 .mailmap | 60 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/.mailmap b/.mailmap
index 6e7e6302165f8..3481a41724bbc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,37 +23,37 @@ Andreas Peters <andreas.joachim.peters@cern.ch> <Andreas.Joachim.Peters@cern.ch>
 Andrew Bartlett <abartlet@catalyst.net.nz> <abartlet@samba.org>
 Andrew Leung <aleung@cs.ucsc.edu> <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
 Andy Allan <andy@gravitystorm.co.uk> <github@gravitystorm.co.uk>
-Anis Ayari <ayari_anis@live.fr> Anols
+Anis Ayari <ayari_anis@live.fr>
 Aristoteles Neto <aristoteles.neto@webdrive.co.nz> <wdneto@users.noreply.github.com>
 Ashish Chandra <ashish.a.chandra@ril.com> <mail.ashishchandra@gmail.com>
 Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu> <baptiste@UbuntuBVM.lan>
 Billy Olsen <billy.olsen@canonical.com> <billy.olsen@gmail.com>
-Bo Cai <cai.bo@h3c.com> caibo <cai.bo@h3c.com>
-Boris Ranto <branto@redhat.com> branto1 <branto@redhat.com>
+Bo Cai <cai.bo@h3c.com>
+Boris Ranto <branto@redhat.com>
 Brian Andrus <bandrus@redhat.com> <bandrus+github@gmail.com>
-Brian Felton <bjfelton@gmail.com> <bjfelton@gmail.com>
-Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
-Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de> <Burkhard.Linke@computational.bio.uni-giessen.de>
+Brian Felton <bjfelton@gmail.com>
+Brian Rak <dn@devicenull.org>
+Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de>
 Caleb Miles <caleb.miles@inktank.com>
 Caleb Miles <caleb.miles@inktank.com> <caselim@gmail.com>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
-Casey Marshall <csm@soe.ucsc.edu> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
-Ce Gu <guce@h3c.com> <guce@h3c.com>
-Chen Dihao <tobeg3oogle@gmail.com> <tobeg3oogle@gmail.com>
+Casey Marshall <csm@soe.ucsc.edu> <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
+Ce Gu <guce@h3c.com>
+Chen Dihao <tobeg3oogle@gmail.com>
 Chendi Xue <chendi.xue@intel.com>
 Chendi Xue <chendi.xue@intel.com> <xuechendi@gmail.com>
-Cheng Cheng <ccheng.leo@gmail.com> <ccheng.leo@gmail.com>
+Cheng Cheng <ccheng.leo@gmail.com>
 Chris Holcombe <chris.holcombe@nebula.com> <xfactor973@gmail.com>
 Christian Brunner <christian@brunner-muc.de> <chb@muc.de>
 Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
-Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gmail.com>
-Chuanhong Wang <wang.chuanhong@zte.com.cn> wangchaunhong <root@A22832429.(none)>
+Christophe Courtaut <christophe.courtaut@gmail.com>
+Chuanhong Wang <wang.chuanhong@zte.com.cn> <root@A22832429.(none)>
 Claire Massot <claire.massot93@gmail.com> <claire12.93@hotmail.fr>
 Clement Lebrun <clement.lebrun.31@gmail.com> <clem_noob@hotmail.fr>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@alumni.cmu.edu>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@fatty.ops.newdream.net>
-Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
-Daniel Gryniewicz <dang@redhat.com>  <dang@fprintf.net>
+Dan Chai <tengweicai@gmail.com> <tengweicai@gmail.com>
+Daniel Gryniewicz <dang@redhat.com> <dang@fprintf.net>
 Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
 Dan Mick <dmick@redhat.com> <dan.mick@redhat.com>
 Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
@@ -63,27 +63,27 @@ Dennis Schafroth <dennis@schafroth.com> <dennis@schafroth.dk>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
 Dmitry Yatsushkevich <dyatsushkevich@mirantis.com> <dmitry.yatsushkevich@gmail.com>
 Dominik Hannen <cantares1+github@gmail.com> <dhxgit@users.noreply.github.com>
-Donghai Xu <xu.donghai@h3c.com> <xu.donghai@h3c.com>
-Dongmao Zhang <deanraccoon@gmail.com> <deanraccoon@gmail.com>
+Donghai Xu <xu.donghai@h3c.com>
+Dongmao Zhang <deanraccoon@gmail.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
 Federico Gimenez <fgimenez@coit.es> <federico.gimenez@hola-internet.com>
 Feng Wang <cyclonew@cs.ucsc.edu> <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
-Florent Bautista <florent@coppint.com> <florent@coppint.com>
+Florent Bautista <florent@coppint.com>
 Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
 Florent Manens <florent@beezim.fr> <florent@manens.org>
-Florian Coste <fcoste21@gmail.com> nairolf21
+Florian Coste <fcoste21@gmail.com>
 Florian Marsylle <florian.marsylle@hotmail.fr> <floleblanc@hotmail.fr>
 François Lafont <flafdivers@free.fr> <francois.lafont@crdp.ac-versailles.fr>
 François Lafont <flafdivers@free.fr> <francois.lafont@ac-versailles.fr>
-Gabriel Sentucq <perso@kazhord.fr> <perso@kazhord.fr>
+Gabriel Sentucq <perso@kazhord.fr>
 Gary Lowell <gary.lowell@inktank.com>
 Gary Lowell <gary.lowell@inktank.com> <glowell@flab.ops.newdream.net>
 Gary Lowell <gary.lowell@inktank.com> <glowell@inktank.com>
 Gaurav Kumar Garg <garg.gaurav52@gmail.com> <ggarg@redhat.com>
 Gerben Meijer <gerben@daybyday.nl> <infernix@gmail.com>
-Germain Chipaux <germain.chipaux@gmail.com> <germain.chipaux@gmail.com>
+Germain Chipaux <germain.chipaux@gmail.com>
 Greg Farnum <gfarnum@redhat.com>
 Greg Farnum <gfarnum@redhat.com> <gfarnum@GF-Macbook.local>
 Greg Farnum <gfarnum@redhat.com> <gfarnum@rehdat.com>
@@ -103,9 +103,9 @@ Haomai Wang <haomai@xsky.com> <haomai@xsky.io>
 Haomai Wang <haomai@xsky.com> <yuyuyu101@163.com>
 Hazem Amara <hazem.amara@telecom-bretagne.eu> <hazem@hazem-Inspiron-3537.(none)>
 Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
-Hervé Rousseau <hroussea@cern.ch> <hroussea@cern.ch>
+Hervé Rousseau <hroussea@cern.ch>
 Holger Macht <hmacht@suse.de> <holger@homac.de>
-Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
+Huamin Chen <hchen@redhat.com>
 Huang Jun <hjwsm1989@gmail.com>
 Ilja Slepnev <islepnev@gmail.com>
 Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
@@ -131,8 +131,8 @@ João Eduardo Luís <joao@suse.de>
 João Eduardo Luís <joao@suse.de> <jluis@suse.com>
 João Eduardo Luís <joao@suse.de> <joao@suse.com>
 Joe Buck <jbbuck@gmail.com> <buck@soe.ucsc.edu>
+John Spray <jspray@redhat.com>
 John Spray <jspray@redhat.com> <jcspray@gmail.com>
-John Spray <jspray@redhat.com> <jspray@redhat.com>
 John Spray <jspray@redhat.com> <john.spray@redhat.com>
 Johnu George <johnugeo@cisco.com> <johnugeorge109@gmail.com>
 John Wilkins <john.wilkins@inktank.com> <john@admin-host.(none)>
@@ -141,15 +141,15 @@ John Wilkins <john.wilkins@inktank.com> <johnw@johnw7664.(none)>
 John Wilkins <jwilkins@redhat.com> <jowilkin@redhat.com>
 John Wilkins <jwilkins@redhat.com> <jowilki@redhat.com>
 John Wilkins <jwilkins@redhat.com> <jowilk@redhat.com>
-Jordan Dorne <jordan.dorne@gmail.com> <jordan.dorne@gmail.com>
+Jordan Dorne <jordan.dorne@gmail.com>
 Josh Durgin <jdurgin@redhat.com>
 Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
 Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
 Kacper Kowalik <xarthisius@gentoo.org>
 Kefu Chai <kchai@redhat.com> <tchaikov@gmail.com>
-Ken Dreyer <kdreyer@redhat.com> <kdreyer@redhat.com>
-Kévin Caradant <kevin.caradant@gmail.com> <kevin.caradant@gmail.com>
-Kiseleva Alyona <akiselyova@mirantis.com> Ved-vampir
+Ken Dreyer <kdreyer@redhat.com>
+Kévin Caradant <kevin.caradant@gmail.com>
+Kiseleva Alyona <akiselyova@mirantis.com>
 Kongming Wu <wu.kongming@h3c.com>
 Laszlo Boszormenyi <gcs@debian.hu>
 Li Wang <li.wang@kylin-cloud.com> <liwang@ubuntukylin.com>
@@ -241,7 +241,7 @@ Scott A. Brandt <scott@cs.ucsc.edu> <sbrandt@29311d96-e01e-0410-9327-a35deaab8ce
 Sébastien Han <shan@redhat.com> <sebastien.han@enovance.com>
 Sebastien Ponce <sebastien.ponce@cern.ch> <Sebastien.Ponce@cern.ch>
 Sergey Arkhipov <nineseconds@yandex.ru>
-Shanggao Qiu <qiushanggao@qq.com> qiushanggao
+Shanggao Qiu <qiushanggao@qq.com>
 Shawn Chen <cxwshawn@gmail.com>
 Shu, Xinxin <xinxin.shu@intel.com>
 Song Baisen <song.baisen@zte.com.cn>
@@ -249,12 +249,12 @@ Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
 Sushma Gurram <sushma.gurram@sandisk.com>
 Swami Reddy <swami.reddy@ril.com> <swamireddy@gmail.com>
 Sylvain Munaut <s.munaut@whatever-company.com> <tnt@246tNt.com>
-Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com> t-miyamae
+Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@tamil-VirtualBox.(none)>
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@ubuntu.(none)>
 Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
-Thomas Cantin <thomas.cantin@telecom-bretagne.eu> ThomasCantin
+Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
 Thomas Johnson <NTmatter@gmail.com> <thomas.johnson@180amsterdam.com>
 Thomas Laumondais <thomas.laumondais@gmail.com> <LSWS0275@EB-OR6251090.toulouse.francetelecom.fr>
 Tianshan Qu <tianshan@xsky.com> <qutianshan@gmail.com>
-- 
2.39.5