From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Oct 2017 05:52:23 +0000 (+0900)
Subject: Merge branch 'rs/rs-mailmap'
X-Git-Tag: v2.15.0-rc1~6
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/3d2a6dc9362ec974002f585c30efa51609da0bf4?hp=6defdc9fe863bd637102f8b5420501654d4a9346

Merge branch 'rs/rs-mailmap'

* rs/rs-mailmap:
.mailmap: normalize name for René Scharfe
---

diff --git a/.mailmap b/.mailmap
index ab85e0d16d..224db83887 100644
--- 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>