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

Trivial merge