Merge branch 'sb/mailmap-updates'
commit3717c73f6205eada7701d254e5c6aff156a14224
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Jul 2013 16:16:39 +0000 (30 09:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Jul 2013 16:16:40 +0000 (30 09:16 -0700)
tree8f2a09e1928625fdb1c041fdb206ccee549a5edf
parent1ddc11a6fd675269529a7e6a5478cdb3fcf966d1
parent78910462ce3aff76ebcfe3a1e6d559c99e14d1fe
Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
  .mailmap: combine more (email, name) to individual persons
.mailmap