Merge gitk to pick up emergency build fix

diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index c7436098c9596f221fc9553c1af7f8a599c6301c..3cc9b034c435a555f96eb7943932045ec2b9bcc8 100644 (file)
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -28,8 +28,7 @@ Gitweb provides a web interface to Git repositories.  Its features include:
   revisions one at a time, viewing the history of the repository.
 * Finding commits which commit messages matches given search term.
 
-See http://git.kernel.org/?p=git/git.git;a=tree;f=gitweb[] or
-http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,
+See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,
 browsed using gitweb itself.