Merge branch 'maint'
commit10b2a48113b8ab6b8f48229eb40fc3637ce025ae
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Oct 2011 04:49:14 +0000 (23 21:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Oct 2011 04:49:14 +0000 (23 21:49 -0700)
tree1ea8b46e0d7f16f91215922645ac7e4afe5557c7
parente454a83fa2640166aba77ef3fe2bfb81949895b8
parentf7d958dff5e194797ef6776bcc77c1349f9f8c81
Merge branch 'maint'

* maint:
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
GIT-VERSION-GEN