Merge branch 'sb/mailmap-updates'
commitec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:59:56 +0000 (18 12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:59:56 +0000 (18 12:59 -0700)
treed89815be4d3e30f8f265b873a60de5d2820d77db
parent802f878b86332a7841dab89dfe29e3e6c90979ab
parentc07a6bc57255a2d00b41333f570b64cc36c70cfb
Merge branch 'sb/mailmap-updates'

* 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