Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index c4f4cabbdcdaae18491c301d44fd68ae89b18352..8243f691138be33c6d9d037a15fabc6786ab385f 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -55,4 +55,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite