![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Feb 2012 22:18:03 +0000 (14:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Feb 2012 22:18:03 +0000 (14:18 -0800) | ||
| commit | 57d6b07f6b6d6abb3f5d0a263f676528ba3dcc15 | |
| tree | 51190ea5290587ff961cc5ee9e379fb78a7b9026 | tree | snapshot |
| parent | f3f3c4dec6351cb875bdd24e685f2e613eb249c1 | commit | diff |
| parent | f026358ef20e0c252388a41fcc8eff125b00927c | commit | diff |
Merge branch 'jc/maint-mailmap-output' into maint
* 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()