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

1  2 
.mailmap
diff --cc .mailmap
Simple merge