Merge branch 'np/maint-safer-pack' into np/pack

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 9e048a8a280f896c0da2396b07eeeddd211f0b75..d3164c5c88db6b9e02a4186c398e19c425bc204b 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -45,7 +45,7 @@ linkgit:git-pull[1]
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
 
 Documentation
 -------------