Merge branch 'maint-1.7.6' into maint-1.7.7
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:44:56 +0000 (21:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:44:56 +0000 (21:44 -0800)
commit7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b
tree6cd9d67bad0f51acbe6baef3fea257f8b0cbc01a
parent791970425431878c8abe71645a03f0f64e20e461
parent15b7898c5e9fc6fed9a6064213cfcd08cf7d7314
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
Documentation/git.txt
builtin/fetch.c