Merge branch 'sb/mailmap-updates'
commit6f7d6ec303898a8223b9bad5f010a514b42c1b73
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2013 21:30:13 +0000 (9 14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2013 21:30:13 +0000 (9 14:30 -0700)
tree2b690f3013ecd1be1c55b2864de3e7583bb41aeb
parent64948ad77534f035311fd3e1086477661c8f63b1
parent182be0d397cec4ec7f649978653f48c497d43d72
Merge branch 'sb/mailmap-updates'

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