Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 616f196d81ca54595dc67f4846bace5880b9b90d..33030c022f1b86a8dba281ff04537c1a40cb6782 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -42,4 +42,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