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 <sbeller@xxxxxxxxxx> --- .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 <chrisw@xxxxxxxxxxxx> <chrisw@xxxxxxxx> Cord Seele <cowose@xxxxxxxxx> <cowose@xxxxxxxxxxxxxx> Christian Couder <chriscool@xxxxxxxxxxxxx> <christian.couder@xxxxxxxxx> Christian Stimming <stimming@xxxxxxx> <chs@ckiste.goetheallee> +Christopher Díaz Riveros <chrisadr@xxxxxxxxxx> Christopher Diaz Riveros Csaba Henk <csaba@xxxxxxxxxxx> <csaba@xxxxxxxxxx> Dan Johnson <computerdruid@xxxxxxxxx> Dana L. How <danahow@xxxxxxxxx> <how@xxxxxxxxxxxxxxxxxxxxxxx> Dana L. How <danahow@xxxxxxxxx> Dana How Daniel Barkalow <barkalow@xxxxxxxxxxxx> +Daniel Knittl-Frank <knittl89@xxxxxxxxxxxxxx> knittl Daniel Trstenjak <daniel.trstenjak@xxxxxxxxx> <daniel.trstenjak@xxxxxxxxx> Daniel Trstenjak <daniel.trstenjak@xxxxxxxxx> <trsten@xxxxxxxxxxxxxxxxxxxx> David Brown <git@xxxxxxxxxx> <davidb@xxxxxxxxxxx> @@ -57,6 +59,7 @@ Eric S. Raymond <esr@xxxxxxxxxxx> Eric Wong <e@xxxxxxxxx> <normalperson@xxxxxxxx> Erik Faye-Lund <kusmabite@xxxxxxxxx> <kusmabite@xxxxxxxxxxxxxx> Eyvind Bernhardsen <eyvind.bernhardsen@xxxxxxxxx> <eyvind-git@xxxxxxxxxxxxxx> +Fangyi Zhou <fangyi.zhou@xxxxxxxxxx> Zhou Fangyi Florian Achleitner <florian.achleitner.2.6.31@xxxxxxxxx> <florian.achleitner2.6.31@xxxxxxxxx> Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> <fbuihuu@xxxxxxxxx> Frank Lichtenheld <frank@xxxxxxxxxxxxxx> <djpig@xxxxxxxxxx> @@ -86,6 +89,8 @@ Jason McMullan <mcmullan@xxxxxxxxxx> Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxxxx> Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxx> Jay Soffian <jaysoffian@xxxxxxxxx> <jaysoffian+git@xxxxxxxxx> +Jean-Noël Avila <jn.avila@xxxxxxx> Jean-Noel Avila +Jean-Noël Avila <jn.avila@xxxxxxx> Jean-Noël AVILA Jeff King <peff@xxxxxxxx> <peff@xxxxxxxxxx> Jeff Muizelaar <jmuizelaar@xxxxxxxxxxx> <jeff@xxxxxxxxxxxx> Jens Axboe <axboe@xxxxxxxxx> <axboe@xxxxxxx> @@ -149,6 +154,7 @@ Matt Draisey <matt@xxxxxxxxxx> <mattdraisey@xxxxxxxxxxxx> Matt Kraai <kraai@xxxxxxxxx> <matt.kraai@xxxxxxxxxxxxxx> Matt McCutchen <matt@xxxxxxxxxxxxxxxxx> <hashproduct@xxxxxxxxx> Matthias Kestenholz <matthias@xxxxxxxxxxx> <mk@xxxxxxxxxxx> +Matthias Rüster <matthias.ruester@xxxxxxxxx> Matthias Ruester Matthias Urlichs <matthias@xxxxxxxxxx> <smurf@kiste.(none)> Matthias Urlichs <matthias@xxxxxxxxxx> <smurf@xxxxxxxxxxxxxx> Michael Coleman <tutufan@xxxxxxxxx> @@ -213,6 +219,8 @@ Sean Estabrooks <seanlkml@xxxxxxxxxxxx> Sebastian Schuberth <sschuberth@xxxxxxxxx> <sschuberth@xxxxxxxxxxxxxxxxx> Seth Falcon <seth@xxxxxxxxxxxxxxx> <sfalcon@xxxxxxxxx> Shawn O. Pearce <spearce@xxxxxxxxxxx> +Wei Shuyu <wsy@xxxxxxxxxx> Shuyu Wei +Sidhant Sharma <tigerkid001@xxxxxxxxx> Sidhant Sharma [:tk] Simon Hausmann <hausmann@xxxxxxx> <simon@xxxxxx> Simon Hausmann <hausmann@xxxxxxx> <shausman@xxxxxxxxxxxxx> Stefan Beller <stefanbeller@xxxxxxxxx> <stefanbeller@xxxxxxxxxxxxxx> @@ -253,7 +261,8 @@ Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> <ukleinek@xxxxxxxxxxxxxx-frei Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> <uzeisberger@xxxxxxxxxxxxx> Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> <zeisberg@xxxxxxxxxxxxxxxxxxxxxxxxxx> Ville Skyttä <ville.skytta@xxxxxx> <scop@xxxxxxxxxx> -Vitaly "_Vi" Shukela <public_vi@xxxxxx> +Vitaly "_Vi" Shukela <vi0oss@xxxxxxxxx> <public_vi@xxxxxx> +Vitaly "_Vi" Shukela <vi0oss@xxxxxxxxx> Vitaly _Vi Shukela W. Trevor King <wking@xxxxxxxxxx> <wking@xxxxxxxxxx> William Pursell <bill.pursell@xxxxxxxxx> YONETANI Tomokazu <y0n3t4n1@xxxxxxxxx> <qhwt+git@xxxxxxxxxx> -- 2.18.0.399.gad0ab374a1-goog
