From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 23:01:26 +0000 (-0800)
Subject: Merge branch 'jm/mailmap'
X-Git-Tag: v1.7.4-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53b17087969cd2b81458c74692532b3764fe16c4?ds=inline;hp=--cc

Merge branch 'jm/mailmap'

* jm/mailmap:
t4203: do not let "git shortlog" DWIM based on tty
t4203 (mailmap): stop hardcoding commit ids and dates
mailmap: fix use of freed memory
---

53b17087969cd2b81458c74692532b3764fe16c4