From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Aug 2013 17:49:33 +0000 (-0700)
Subject: Merge branch 'sb/mailmap-updates'
X-Git-Tag: v1.8.4-rc3~2
X-Git-Url: https://repo.or.cz/w/alt-git.git/commitdiff_plain/2809258c28b92add5dfa0b72703c477a7f5ac0ff

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
---

2809258c28b92add5dfa0b72703c477a7f5ac0ff