Merge branch 'jc/maint-no-openssl-build-fix' into next
commite348a8704e9acfb4ce3956593fbefdb9bd0ba893
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 23:15:30 +0000 (8 15:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 23:15:30 +0000 (8 15:15 -0800)
treee058912d9317a2cb5446c6bec93a9baab9bab46f
parentf8216945ae84504c67dfd3c9ab123ebea0e022d5
parent5b02b9baf728f6155e2996e5945e07f2e1a57b05
Merge branch 'jc/maint-no-openssl-build-fix' into next

* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL
Makefile