From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Nov 2011 19:14:00 +0000 (-0800)
Subject: Merge branch 'ml/mailmap' into maint
X-Git-Tag: v1.7.7.4~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f?hp=79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f

Merge branch 'ml/mailmap' into maint

* ml/mailmap:
mailmap: xcalloc mailmap_info

Conflicts:
mailmap.c
---