Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index ef1f055c8574e928c8e05c820f2f1cc962e3d422..b05e0cee11352335cbeb1899e8d6cb7070395e37 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -159,7 +159,7 @@ linkgit:gitattributes[5]
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite