Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt
index 434607bfb5d105cb2e1a9ce0bdf5a3261ec64e78..65c68176e57349f8f9ec672906a8ea70e6516cd0 100644 (file)
--- a/Documentation/git-tar-tree.txt
+++ b/Documentation/git-tar-tree.txt
@@ -86,4 +86,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite