From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Jul 2013 16:16:39 +0000 (-0700)
Subject: Merge branch 'sb/mailmap-updates'
X-Git-Tag: v1.8.4-rc1~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3717c73f6205eada7701d254e5c6aff156a14224?ds=inline;hp=-c

Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
.mailmap: combine more (email, name) to individual persons
---

3717c73f6205eada7701d254e5c6aff156a14224
diff --combined .mailmap
index 57070b50d1,40e787a463..57551b05d6
--- a/.mailmap
+++ b/.mailmap
@@@ -26,6 -26,8 +26,8 @@@ Bryan Larsen <bryan@larsen.st> <bryanla
  Cheng Renquan <crquan@gmail.com>
  Chris Shoemaker <c.shoemaker@cox.net>
  Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
+ Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
+ Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
  Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
  Dan Johnson <computerdruid@gmail.com>
  Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
@@@ -74,6 -76,7 +76,7 @@@ Johannes Schindelin <Johannes.Schindeli
  Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
  Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
  Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
+ John 'Warthog9' Hawley <warthog9@kernel.org> <warthog9@eaglescrag.net>
  Jon Loeliger <jdl@jdl.com> <jdl@freescale.com>
  Jon Loeliger <jdl@jdl.com> <jdl@freescale.org>
  Jon Seymour <jon.seymour@gmail.com> <jon@blackcubes.dyndns.org>
@@@ -163,7 -166,7 +166,7 @@@ Philipp A. Hartmann <pah@qo.cx> <ph@sor
  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>
@@@ -181,6 -184,7 +184,7 @@@ Simon Hausmann <hausmann@kde.org> <shau
  Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
  Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
  Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
+ Štěpán Němec <stepnem@gmail.com> <stepan.nemec@gmail.com>
  Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
  Steven Drake <sdrake@xnet.co.nz> <sdrake@ihug.co.nz>
  Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>