Merge branch 'jc/maint-mailmap-output' into maint

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

Junio C Hamano committed Feb 16, 2012 at 14:18 UTC 57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15

No changes.