Merge branch 'rj/mailmap-ramsay'

gitster · gitster · commit 74a844a5555b · 2015-09-21T12:58:35.000-07:00
* rj/mailmap-ramsay:
  mailmap: update my entry with new email address
diff --git a/.mailmap b/.mailmap
@@ -186,7 +186,7 @@ Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
 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>
+Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
 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>

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