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)
commit40d675f417f7b0be7b9367752701bf6bc03db091
tree1b69be96d7c41f361d684f9f8eefa6fdae7f95ea
parentb69fb7866b24b205a876a6a0b256c786a58419c7
parent5b02b9baf728f6155e2996e5945e07f2e1a57b05
Merge branch 'jc/maint-no-openssl-build-fix' into maint

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