Merge branch 'fl/doc'
commitbdceecbbd76c4b2bc045d2384635c09b85d94415
authorJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 07:10:13 +0000 (4 00:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 07:10:13 +0000 (4 00:10 -0700)
tree38455f8b200037e2c341d157e6953ec9e46295ff
parent1f71372711a18ccb3af1114e860f82dcb3ba8152
parentd3d4fa86319a0bf97752e285907a8d34a2824951
Merge branch 'fl/doc'

* fl/doc:
  Documentation: unbreak user-manual.
  Documentation: Add version information to man pages
  Documentation: Replace @@GIT_VERSION@@ in documentation