Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 57b7498239287779e7bae92bb09a0bb9eb0eed76..84f60f3407499c40a8e0caadf9d40ed5e9b8386b 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -64,7 +64,7 @@ linkgit:gitignore[5]
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>.
+Junio C Hamano <gitster@pobox.com>.
 
 Documentation
 --------------