@matheusbsbs / matheus-bagliano / commits / 6d1cdadbee

Merge branch 'ml/mailmap' into maint-1.7.6

* ml/mailmap: mailmap: xcalloc mailmap_info Conflicts: mailmap.c

Junio C Hamano committed Dec 13, 2011 at 21:12 UTC 6d1cdadbeeb03f40250526e29b1f1a91582911d8

No changes.