From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Feb 2012 22:18:03 +0000 (-0800)
Subject: Merge branch 'jc/maint-mailmap-output' into maint
X-Git-Tag: v1.7.9.2~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15;p=git.git

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

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

57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15