Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Aug 2013 17:49:33 +0000 (13 10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Aug 2013 17:49:33 +0000 (13 10:49 -0700)
* sb/mailmap-updates:
  .mailmap: Combine more (name, email) to individual persons
  .mailmap: update long-lost friends with multiple defunct addresses

1  2 
.mailmap

diff --cc .mailmap
Simple merge