Merge branch 'sb/mailmap-updates'

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

Junio C Hamano committed Aug 9, 2013 at 14:30 UTC 6f7d6ec303898a8223b9bad5f010a514b42c1b73

No changes.