Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes

diff --cc Documentation/git.txt
index 5e80cfd71a5529225b607bd3f1732d19f05d0c1d,bcedfc1a54aeeac067d4eb45d8ba88a3821ac4f3..4a29f47b41057d5f4681d299dd9ed47c1fef2009
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,15 -44,10 +44,16 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.7.6.4/git.html[documentation for release 1.7.6.4]
 +* link:v1.7.7.1/git.html[documentation for release 1.7.7.1]
 +
 +* release notes for
 +  link:RelNotes/1.7.7.1.txt[1.7.7.1],
 +  link:RelNotes/1.7.7.txt[1.7.7].
 +
+ * link:v1.7.6.5/git.html[documentation for release 1.7.6.5]
  
  * release notes for
+   link:RelNotes/1.7.6.5.txt[1.7.6.5],
    link:RelNotes/1.7.6.4.txt[1.7.6.4],
    link:RelNotes/1.7.6.3.txt[1.7.6.3],
    link:RelNotes/1.7.6.2.txt[1.7.6.2],

diff --cc builtin/fetch.c
Simple merge