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=--cc

Merge branch 'sb/mailmap-updates'

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

4fcd30df85a50ad244424e220a0e032cdd544266