From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Aug 2013 21:30:13 +0000 (-0700)
Subject: Merge branch 'sb/mailmap-updates'
X-Git-Tag: v1.8.4-rc3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f7d6ec303898a8223b9bad5f010a514b42c1b73

Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
.mailmap: fixup entries
---

6f7d6ec303898a8223b9bad5f010a514b42c1b73