From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Feb 2017 21:36:57 +0000 (-0800)
Subject: Merge branch 'sg/mailmap-self'
X-Git-Tag: v2.12.0-rc0~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be6de6ecf99f8390fb09fef12cf4d739263b5124?ds=inline;hp=-c

Merge branch 'sg/mailmap-self'

* sg/mailmap-self:
.mailmap: update Gábor Szeder's email address
---

be6de6ecf99f8390fb09fef12cf4d739263b5124
diff --combined .mailmap
index 9c87a3840b,ab4dab0d9e..ab59b2fac6
--- a/.mailmap
+++ b/.mailmap
@@@ -192,8 -192,6 +192,8 @@@ 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>
 +Richard Hansen <rhansen@rhansen.org> <hansenr@google.com>
 +Richard Hansen <rhansen@rhansen.org> <rhansen@bbn.com>
  Robert Fitzsimons <robfitz@273k.net>
  Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
  Robert Zeh <robert.a.zeh@gmail.com>
@@@ -225,6 -223,7 +225,7 @@@ Steven Walter <stevenrwalter@gmail.com
  Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
  Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
  Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
+ SZEDER Gábor <szeder.dev@gmail.com> <szeder@ira.uka.de>
  Tay Ray Chuan <rctay89@gmail.com>
  Ted Percival <ted@midg3t.net> <ted.percival@quest.com>
  Theodore Ts'o <tytso@mit.edu>