Andrew's git / gitweb.git / diff
?
Merge branch 'jc/maint-mailmap-output'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:39 +0000 (22:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:39 +0000 (22:43 -0800)
* jc/maint-mailmap-output:
mailmap: always return a plain mail address from map_user()

Trivial merge