tree cebd029e483ae1b703045d0f337e38514d85e061
parent e41f8d98e37643909e22317f2ffdd940b953af55
parent 309a9e33731a56487944dbaa00073f8ee05c9f70
author Junio C Hamano <gitster@pobox.com> 1433530828 -0700
committer Junio C Hamano <gitster@pobox.com> 1433530828 -0700

Merge branch 'jk/skip-http-tests-under-no-curl' into maint

Test clean-up.

* jk/skip-http-tests-under-no-curl:
  tests: skip dav http-push tests under NO_EXPAT=NoThanks
  t/lib-httpd.sh: skip tests if NO_CURL is defined