[PATCH 1/3] .mailmap: merge different spellings of names

[Stefan Beller]

This is a continuation of 94b410bba86 (.mailmap: Map email
addresses to names, 2013-07-12), merging names that are
spelled differently but have the same author email to the
same person.

Most spellings differed in accents or the order of names.

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 .mailmap | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index df7cf6313c7..f165222a782 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,11 +35,13 @@ Chris Wright <chr...@sous-sol.org> <chr...@osdl.org>
 Cord Seele <cow...@gmail.com> <cow...@googlemail.com>
 Christian Couder <chrisc...@tuxfamily.org> <christian.cou...@gmail.com>
 Christian Stimming <stimm...@tuhh.de> <chs@ckiste.goetheallee>
+Christopher Díaz Riveros <chris...@gentoo.org> Christopher Diaz Riveros
 Csaba Henk <cs...@gluster.com> <cs...@lowlife.hu>
 Dan Johnson <computerdr...@gmail.com>
 Dana L. How <dana...@gmail.com> <h...@deathvalley.cswitch.com>
 Dana L. How <dana...@gmail.com> Dana How
 Daniel Barkalow <barka...@iabervon.org>
+Daniel Knittl-Frank <knitt...@googlemail.com> knittl
 Daniel Trstenjak <daniel.trsten...@gmail.com> <daniel.trsten...@online.de>
 Daniel Trstenjak <daniel.trsten...@gmail.com> <trs...@science-computing.de>
 David Brown <g...@davidb.org> <dav...@quicinc.com>
@@ -57,6 +59,7 @@ Eric S. Raymond <e...@thyrsus.com>
 Eric Wong <e...@80x24.org> <normalper...@yhbt.net>
 Erik Faye-Lund <kusmab...@gmail.com> <kusmab...@googlemail.com>
 Eyvind Bernhardsen <eyvind.bernhard...@gmail.com> <eyvind-...@orakel.ntnu.no>
+Fangyi Zhou <fangyi.z...@yuriko.moe> Zhou Fangyi
 Florian Achleitner <florian.achleitner.2.6...@gmail.com> 
<florian.achleitner2.6...@gmail.com>
 Franck Bui-Huu <vagabon....@gmail.com> <fbui...@gmail.com>
 Frank Lichtenheld <fr...@lichtenheld.de> <dj...@debian.org>
@@ -86,6 +89,8 @@ Jason McMullan <mcmul...@netapp.com>
 Jason Riedy <e...@eecs.berkeley.edu> <e...@eecs.berkeley.edu>
 Jason Riedy <e...@eecs.berkeley.edu> <e...@cs.berkeley.edu>
 Jay Soffian <jaysoff...@gmail.com> <jaysoffian+...@gmail.com>
+Jean-Noël Avila <jn.av...@free.fr> Jean-Noel Avila
+Jean-Noël Avila <jn.av...@free.fr> Jean-Noël AVILA
 Jeff King <p...@peff.net> <p...@github.com>
 Jeff Muizelaar <jmuizel...@mozilla.com> <j...@infidigm.net>
 Jens Axboe <ax...@kernel.dk> <ax...@suse.de>
@@ -149,6 +154,7 @@ Matt Draisey <m...@draisey.ca> <mattdrai...@sympatico.ca>
 Matt Kraai <kr...@ftbfs.org> <matt.kr...@amo.abbott.com>
 Matt McCutchen <m...@mattmccutchen.net> <hashprod...@gmail.com>
 Matthias Kestenholz <matth...@spinlock.ch> <m...@spinlock.ch>
+Matthias Rüster <matthias.rues...@gmail.com> Matthias Ruester
 Matthias Urlichs <matth...@urlichs.de> <smurf@kiste.(none)>
 Matthias Urlichs <matth...@urlichs.de> <sm...@smurf.noris.de>
 Michael Coleman <tutu...@gmail.com>
@@ -213,6 +219,8 @@ Sean Estabrooks <seanl...@sympatico.ca>
 Sebastian Schuberth <sschube...@gmail.com> <sschube...@visageimaging.com>
 Seth Falcon <s...@userprimary.net> <sfal...@fhcrc.org>
 Shawn O. Pearce <spea...@spearce.org>
+Wei Shuyu <w...@dogben.com> Shuyu Wei
+Sidhant Sharma <tigerkid...@gmail.com> Sidhant Sharma [:tk]
 Simon Hausmann <hausm...@kde.org> <si...@lst.de>
 Simon Hausmann <hausm...@kde.org> <shaus...@trolltech.com>
 Stefan Beller <stefanbel...@gmail.com> <stefanbel...@googlemail.com>
@@ -253,7 +261,8 @@ Uwe Kleine-König <u.kleine-koe...@pengutronix.de> 
<uklei...@informatik.uni-frei
 Uwe Kleine-König <u.kleine-koe...@pengutronix.de> <uzeisber...@io.fsforth.de>
 Uwe Kleine-König <u.kleine-koe...@pengutronix.de> 
<zeisb...@informatik.uni-freiburg.de>
 Ville Skyttä <ville.sky...@iki.fi> <s...@xemacs.org>
-Vitaly "_Vi" Shukela <public...@tut.by>
+Vitaly "_Vi" Shukela <vi0...@gmail.com> <public...@tut.by>
+Vitaly "_Vi" Shukela <vi0...@gmail.com> Vitaly _Vi Shukela
 W. Trevor King <wk...@tremily.us> <wk...@drexel.edu>
 William Pursell <bill.purs...@gmail.com>
 YONETANI Tomokazu <y0n3t...@gmail.com> <qhwt+...@les.ath.cx>
-- 
2.18.0.399.gad0ab374a1-goog