Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Jul 2013 16:16:39 +0000 (09:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Jul 2013 16:16:40 +0000 (09:16 -0700)
* sb/mailmap-updates:
  .mailmap: combine more (email, name) to individual persons

1  2 
.mailmap

diff --cc .mailmap
Simple merge