Code

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)
commit57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15
tree51190ea5290587ff961cc5ee9e379fb78a7b9026
parentf3f3c4dec6351cb875bdd24e685f2e613eb249c1
parentf026358ef20e0c252388a41fcc8eff125b00927c
Merge branch 'jc/maint-mailmap-output' into maint

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