From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Jul 2013 19:59:58 +0000 (-0700)
Subject: Merge branch 'rs/mailmap-himself'
X-Git-Tag: v1.8.4-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cbc7fdf81dee94333f11e775ab47b7e7b35ea81c?hp=ec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029

Merge branch 'rs/mailmap-himself'

* rs/mailmap-himself:
.mailmap: René Scharfe has a new email address
---

diff --git a/.mailmap b/.mailmap
index df8898ffd0..57070b50d1 100644
--- 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>