Merge with master.

diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
index ec1e7a2a90d54cbc9d3e97081bdce12af9a88b0c..ad9d3ab31534ab2f71bb791eb96970c7048ac843 100644 (file)
--- a/Documentation/git-pull-script.txt
+++ b/Documentation/git-pull-script.txt
@@ -1,6 +1,6 @@
 git-pull-script(1)
 ==================
-v0.1, May 2005
+v0.99.4, Aug 2005
 
 NAME
 ----
@@ -25,7 +25,8 @@ include::pull-fetch-param.txt[]
 
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
+Written by Linus Torvalds <torvalds@osdl.org>
+and Junio C Hamano <junkio@cox.net>
 
 Documentation
 --------------