Merge branch 'jm/mailmap' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:47:18 +0000 (24 12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:47:18 +0000 (24 12:47 -0800)
* 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


Trivial merge