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)
commit3717c73...6205eada7701d254e5c6aff156a14224
tree8f2a09e...928625fdb1c041fdb206ccee549a5edfcopy hash to clipboard (tree)
parent1ddc11a...fd675269529a7e6a5478cdb3fcf966d1copy hash to clipboard (diff)
parent7891046...ce3aff76ebcfe3a1e6d559c99e14d1fecopy hash to clipboard (diff)
.mailmap