Files
git-mirror/mailmap.c
Junio C Hamano 6d1cdadbee Merge branch 'ml/mailmap' into maint-1.7.6
* ml/mailmap:
  mailmap: xcalloc mailmap_info

Conflicts:
	mailmap.c
2011-12-13 21:12:14 -08:00

6.4 KiB