From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Nov 2016 21:56:30 +0000 (-0800)
Subject: Merge branch 'ls/macos-update'
X-Git-Tag: v2.11.0-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/332fd5655a1e162b2fe47009dfc77ca2a94908e7?hp=332fd5655a1e162b2fe47009dfc77ca2a94908e7

Merge branch 'ls/macos-update'

Portability update and workaround for builds on recent Mac OS X.

* ls/macos-update:
travis-ci: disable GIT_TEST_HTTPD for macOS
Makefile: set NO_OPENSSL on macOS by default
---