Merge branch 'jc/maint-no-openssl-build-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:50:20 +0000 (07:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:50:20 +0000 (07:50 -0800)
* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL

1  2 
Makefile

diff --cc Makefile
Simple merge