Merge branch 'maint-1.7.0' into maint
commit371276bf29314af04b804cfd877abcac62674a58
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:59:36 +0000 (28 16:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:59:36 +0000 (28 16:59 -0700)
tree1c379eceeb15e83f81ed4f54d6af7c77d9819a50
parentff9c0825cfb1840238b6019dddb52763ed96fc82
parent70b89f871e1afa1fe3ffa22bf3e2043d4405954a
Merge branch 'maint-1.7.0' into maint

* maint-1.7.0:
  Makefile: reenable install with NO_CURL
Makefile