Code

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

1  2 
Makefile

diff --cc Makefile
Simple merge