![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 06:43:39 +0000 (22:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 06:43:39 +0000 (22:43 -0800) | ||
| commit | b95ffc143fee155e9ef7ef5e4def38c58febf2ee | |
| tree | cd6a845e8fe90138345a9272ce62972e68d4eb6c | tree | snapshot |
| parent | 974e978b09fdabba009c18f99db54cc36baf9c36 | commit | diff |
| parent | f026358ef20e0c252388a41fcc8eff125b00927c | commit | diff |
Merge branch 'jc/maint-mailmap-output'
* jc/maint-mailmap-output:
mailmap: always return a plain mail address from map_user()
* jc/maint-mailmap-output:
mailmap: always return a plain mail address from map_user()