Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Aug 2013 17:49:33 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Aug 2013 17:49:33 +0000 (10:49 -0700)
commit2809258c28b92add5dfa0b72703c477a7f5ac0ff
treedbfba8d991b78ff0c7b193f0b43a71f6e1d92183
parent8ed205a380a3ec5e92fb8ae69f5cb20b6cbaa636
parentcdb6b5ac67a48e6d25eb44dd2d632b60cfc7b743
Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
  .mailmap: Combine more (name, email) to individual persons
  .mailmap: update long-lost friends with multiple defunct addresses
.mailmap