Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:14 +0000 (10:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:14 +0000 (10:11 -0700)
commit4fcd30d...85a50ad244424e220a0e032cdd544266
tree4e738ea...a1d1e7ee09fcecba7721c23da80dd9f5copy hash to clipboard (tree)
parentd6f3ab5...3ee48927c7ef272e56b043758feb0a81copy hash to clipboard (diff)
parent487e570...852cca03f924ea4dcfbcad1030db58d8copy hash to clipboard (diff)
.mailmap