Sync with 1.6.1.1

diff --cc Documentation/git.txt
index 17dc8b20192f2558775250436152d0e8acfde41e,17dc8b20192f2558775250436152d0e8acfde41e..cd527c6252a678e0bd5e6fa918771efbfe51bd47
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,9 +43,10 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
--* link:v1.6.1/git.html[documentation for release 1.6.1]
++* link:v1.6.1.1/git.html[documentation for release 1.6.1.1]
  
  * release notes for
++  link:RelNotes-1.6.1.1.txt[1.6.1.1],
    link:RelNotes-1.6.1.txt[1.6.1].
  
  * link:v1.6.0.6/git.html[documentation for release 1.6.0.6]

diff --cc GIT-VERSION-GEN
index 6c7465c75865577a87260c7936cb286ab84c6db6,fe496e5fca57cba6d00b3d29589dd9c600276bfd..9c9fe640fbd425c4c35c6ecb5b0bf621e0c506d8
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v1.6.0.2.GIT
 -DEF_VER=v1.6.1.1.GIT
++DEF_VER=v1.6.1.GIT
  
  LF='
  '