Merge branch 'maint-2.6' into maint-2.7

diff --cc Documentation/git.txt
index 754dc80b39d78e12d1a83c58570b3158d1cb521c,64ac7b255f7b29acb03455d44aecbebf1a4bd00a..4b324c8f5eda181dbc992bb67d8d6b3e538732c5
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,17 -43,10 +43,18 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.6.6/git.html[documentation for release 2.6.6]
 +* link:v2.7.3/git.html[documentation for release 2.7.3]
 +
 +* release notes for
 +  link:RelNotes/2.7.3.txt[2.7.3],
 +  link:RelNotes/2.7.2.txt[2.7.2],
 +  link:RelNotes/2.7.1.txt[2.7.1],
 +  link:RelNotes/2.7.0.txt[2.7].
 +
+ * link:v2.6.7/git.html[documentation for release 2.6.7]
  
  * release notes for
+   link:RelNotes/2.6.7.txt[2.6.7],
    link:RelNotes/2.6.6.txt[2.6.6],
    link:RelNotes/2.6.5.txt[2.6.5],
    link:RelNotes/2.6.4.txt[2.6.4],