Merge branch 'ml/mailmap' into maint
commit79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000 (18 11:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000 (18 11:14 -0800)
tree9ae710ca2bcb33eca92ebcb1fff61b98d4e08194
parent01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64
parent74b531f65feaa09b5c3963f788b437a368933730
Merge branch 'ml/mailmap' into maint

* ml/mailmap:
  mailmap: xcalloc mailmap_info

Conflicts:
mailmap.c
mailmap.c