Merge branch 'maint-1.7.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:59:36 +0000 (16:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:59:36 +0000 (16:59 -0700)
* maint-1.7.0:
  Makefile: reenable install with NO_CURL

1  2 
Makefile

diff --cc Makefile
Simple merge