summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-05 12:44:08 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-06 12:08:48 -0700
commitadc3192ef95bd572f61a5a88cab260ee3ff75d47 (patch)
tree83828369502d7bbe94edebfa8c8d240c8d803ee2 /.mailmap
parent1e633418479926bc85ed21a4f91c845a3dd3ad66 (diff)
downloadgit-adc3192ef95bd572f61a5a88cab260ee3ff75d47.tar.gz
Martin Langhoff has a new e-mail address
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index a8091eb5df..19c8726232 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,7 +36,7 @@ Lars Doelle <lars.doelle@on-line ! de>
Lars Doelle <lars.doelle@on-line.de>
Li Hong <leehong@pku.edu.cn>
Lukas Sandström <lukass@etek.chalmers.se>
-Martin Langhoff <martin@catalyst.net.nz>
+Martin Langhoff <martin@laptop.org>
Michael Coleman <tutufan@gmail.com>
Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
Michael W. Olson <mwolson@gnu.org>