Merge branch 'sb/mailmap'

* sb/mailmap:
  .mailmap: merge different spellings of names

Author: gitster

.mailmap

@@ -35,11 +35,13 @@ Chris Wright <[email protected]> <[email protected]>
 Cord Seele <[email protected]> <[email protected]>
 Christian Couder <[email protected]> <[email protected]>
 Christian Stimming <[email protected]> <[email protected]>
+Christopher Díaz Riveros <[email protected]> Christopher Diaz Riveros
 Csaba Henk <[email protected]> <[email protected]>
 Dan Johnson <[email protected]>
 Dana L. How <[email protected]> <[email protected]>
 Dana L. How <[email protected]> Dana How
 Daniel Barkalow <[email protected]>
+Daniel Knittl-Frank <[email protected]> knittl
 Daniel Trstenjak <[email protected]> <[email protected]>
 Daniel Trstenjak <[email protected]> <[email protected]>
 David Brown <[email protected]> <[email protected]>
@@ -57,6 +59,7 @@ Eric S. Raymond <[email protected]>
 Eric Wong <[email protected]> <[email protected]>
 Erik Faye-Lund <[email protected]> <[email protected]>
 Eyvind Bernhardsen <[email protected]> <[email protected]>
+Fangyi Zhou <[email protected]> Zhou Fangyi
 Florian Achleitner <[email protected]> <[email protected]>
 Franck Bui-Huu <[email protected]> <[email protected]>
 Frank Lichtenheld <[email protected]> <[email protected]>
@@ -86,6 +89,8 @@ Jason McMullan <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jay Soffian <[email protected]> <[email protected]>
+Jean-Noël Avila <[email protected]> Jean-Noel Avila
+Jean-Noël Avila <[email protected]> Jean-Noël AVILA
 Jeff King <[email protected]> <[email protected]>
 Jeff Muizelaar <[email protected]> <[email protected]>
 Jens Axboe <[email protected]> <[email protected]>
@@ -149,6 +154,7 @@ Matt Draisey <[email protected]> <[email protected]>
 Matt Kraai <[email protected]> <[email protected]>
 Matt McCutchen <[email protected]> <[email protected]>
 Matthias Kestenholz <[email protected]> <[email protected]>
+Matthias Rüster <[email protected]> Matthias Ruester
 Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
 Matthias Urlichs <[email protected]> <[email protected]>
 Michael Coleman <[email protected]>
@@ -213,6 +219,8 @@ Sean Estabrooks <[email protected]>
 Sebastian Schuberth <[email protected]> <[email protected]>
 Seth Falcon <[email protected]> <[email protected]>
 Shawn O. Pearce <[email protected]>
+Wei Shuyu <[email protected]> Shuyu Wei
+Sidhant Sharma <[email protected]> Sidhant Sharma [:tk]
 Simon Hausmann <[email protected]> <[email protected]>
 Simon Hausmann <[email protected]> <[email protected]>
 Stefan Beller <[email protected]> <[email protected]>
@@ -253,7 +261,8 @@ Uwe Kleine-König <[email protected]> <[email protected]
 Uwe Kleine-König <[email protected]> <[email protected]>
 Uwe Kleine-König <[email protected]> <[email protected]>
 Ville Skyttä <[email protected]> <[email protected]>
-Vitaly "_Vi" Shukela <[email protected]>
+Vitaly "_Vi" Shukela <[email protected]> <[email protected]>
+Vitaly "_Vi" Shukela <[email protected]> Vitaly _Vi Shukela
 W. Trevor King <[email protected]> <[email protected]>
 William Pursell <[email protected]>
 YONETANI Tomokazu <[email protected]> <[email protected]>