Merge branch 'rs/rs-mailmap' into maint

gitster · gitster · commit ac86677afb12 · 2017-10-18T14:19:14.000+09:00
* rs/rs-mailmap:
  .mailmap: normalize name for René Scharfe
diff --git a/.mailmap b/.mailmap
@@ -194,6 +194,7 @@ Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
 René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
+René Scharfe <l.s.r@web.de> Rene Scharfe
 Richard Hansen <rhansen@rhansen.org> <hansenr@google.com>
 Richard Hansen <rhansen@rhansen.org> <rhansen@bbn.com>
 Robert Fitzsimons <robfitz@273k.net>

-Original file line number
+Diff line change
 Ralf Thielow <[email protected]> <[email protected]>
 Ramsay Jones <[email protected]> <[email protected]>
 René Scharfe <[email protected]> <[email protected]>
 +René Scharfe <[email protected]> Rene Scharfe
 Richard Hansen <[email protected]> <[email protected]>
 Richard Hansen <[email protected]> <[email protected]>
 Robert Fitzsimons <[email protected]>