Merge branch 'master' into next
commit923671ac3ca6473300aba84d97f162d43d40709a
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 05:08:58 +0000 (17 22:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 05:08:58 +0000 (17 22:08 -0700)
treeb3f701edc847cd68fcc673fc401230f6e7301093
parent9079d26c8532bdeb95c6913411f9b5d647a3aac3
parent08cfdbb88cd6225b4fc4b8a3cecd0e01758c835d
Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.8
  resolve_gitlink_packed_ref(): fix mismerge
refs.c