Code

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)
commitb95ffc143fee155e9ef7ef5e4def38c58febf2ee
treecd6a845e8fe90138345a9272ce62972e68d4eb6c
parent974e978b09fdabba009c18f99db54cc36baf9c36
parentf026358ef20e0c252388a41fcc8eff125b00927c
Merge branch 'jc/maint-mailmap-output'

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