Merge branch 'rs/mailmap-himself'

gitster · gitster · commit cbc7fdf81dee · 2013-07-18T12:59:58.000-07:00
* rs/mailmap-himself:
  .mailmap: René Scharfe has a new email address
diff --git a/.mailmap b/.mailmap
@@ -163,7 +163,7 @@ Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
-René Scharfe <rene.scharfe@lsrfire.ath.cx>
+René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
 Robert Fitzsimons <robfitz@273k.net>
 Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
 Robert Zeh <robert.a.zeh@gmail.com>

-Original file line number
+Diff line change
 Philippe Bruhat <[email protected]>
 Ralf Thielow <[email protected]> <[email protected]>
 Ramsay Allan Jones <[email protected]>
 -René Scharfe <[email protected]>
 +René Scharfe <[email protected]> <[email protected]>
 Robert Fitzsimons <[email protected]>
 Robert Shearman <[email protected]> <[email protected]>
 Robert Zeh <[email protected]>