From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 06:43:39 +0000 (-0800)
Subject: Merge branch 'jc/maint-mailmap-output'
X-Git-Tag: v1.7.10-rc0~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b95ffc143fee155e9ef7ef5e4def38c58febf2ee;p=thirdparty%2Fgit.git

Merge branch 'jc/maint-mailmap-output'

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

b95ffc143fee155e9ef7ef5e4def38c58febf2ee