Merge branch 'ml/mailmap' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:12:14 +0000 (21:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:12:14 +0000 (21:12 -0800)
commit6d1cdadbeeb03f40250526e29b1f1a91582911d8
tree6d829c82ee1c03e29d723bc81113f8452bbbe294
parentc3ea051544cb1d98a5ae7f64d077084a9a5db5c1
parent74b531f65feaa09b5c3963f788b437a368933730
Merge branch 'ml/mailmap' into maint-1.7.6

* ml/mailmap:
  mailmap: xcalloc mailmap_info

Conflicts:
mailmap.c
mailmap.c