Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:59:56 +0000 (12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:59:56 +0000 (12:59 -0700)
* sb/mailmap-updates:
.mailmap: combine more (email, name) to individual persons
.mailmap: Combine more (email, name) to individual persons
.mailmap: Map email addresses to names

Trivial merge