Merge branch 'na/no-http-test-in-the-middle' into maint
commit62bfd831bc21c3dce06b82e30ee44eaa2ae674ad
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:50:13 +0000 (25 11:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:50:13 +0000 (25 11:50 -0700)
tree0b5283ca56693e7cb6ff12a2a12d1ca7fa762c23
parent287a8701f6fe263696e9c74a3a2020f4cfbf4239
parentafa53fe5d17f5ccf4bce9e3525d83696805098af
Merge branch 'na/no-http-test-in-the-middle' into maint

The mode to run tests with HTTP server tests disabled was broken.

* na/no-http-test-in-the-middle:
  t5538: move http push tests out to t5542