@matheusbsbs / matheus-bagliano / commits / 79cfe0c5c4

Merge branch 'ml/mailmap' into maint

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

Junio C Hamano committed Nov 18, 2011 at 11:14 UTC 79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f

No changes.