Merge branch 'bc/maint-am-email'

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index d7fad1532936d909f9daf59f209e9c59c17c74c5..cadfbd90403766d44598c8d96d89dc5a0e4e2ef8 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -67,7 +67,7 @@ git whatchanged --since="2 weeks ago" \-- gitk::
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
 
 
 Documentation