Andrew's git / gitweb.git / diff
?
Merge branch 'ml/mailmap' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800)
* ml/mailmap:
mailmap: xcalloc mailmap_info

Conflicts:
mailmap.c

No differences found