From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Aug 2013 17:11:14 +0000 (-0700)
Subject: Merge branch 'sb/mailmap-updates'
X-Git-Tag: v1.8.4-rc2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4fcd30df85a50ad244424e220a0e032cdd544266?ds=inline;hp=-c

Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
.mailmap: Multiple addresses of Michael S. Tsirkin
---

4fcd30df85a50ad244424e220a0e032cdd544266
diff --combined .mailmap
index 57551b05d6,ee2f2dca31..dfa2e65348
--- a/.mailmap
+++ b/.mailmap
@@@ -130,6 -130,9 +130,9 @@@ Matthias Urlichs <matthias@urlichs.de> 
  Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
  Michael Coleman <tutufan@gmail.com>
  Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
+ Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
+ Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
+ Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>
  Michael W. Olson <mwolson@gnu.org>
  Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
  Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
@@@ -166,7 -169,7 +169,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>