Merge branch 'jc/maint-mailmap-output'

* jc/maint-mailmap-output: mailmap: always return a plain mail address from map_user()

Junio C Hamano committed Feb 12, 2012 at 22:43 UTC b95ffc143fee155e9ef7ef5e4def38c58febf2ee

No changes.