![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Nov 2011 19:14:00 +0000 (11:14 -0800) | ||
| commit | 79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f | |
| tree | 9ae710ca2bcb33eca92ebcb1fff61b98d4e08194 | tree | snapshot |
| parent | 01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64 | commit | diff |
| parent | 74b531f65feaa09b5c3963f788b437a368933730 | commit | diff |
Merge branch 'ml/mailmap' into maint
* ml/mailmap:
mailmap: xcalloc mailmap_info
Conflicts:
mailmap.c
* ml/mailmap:
mailmap: xcalloc mailmap_info
Conflicts:
mailmap.c
| mailmap.c | diff1 | | diff2 | | blob | history |