Merge branch 'na/no-http-test-in-the-middle'
commit0908b6dfc307b68822a00b9263293dd516d609d3
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 18:26:51 +0000 (9 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 18:26:51 +0000 (9 11:26 -0700)
tree5b8a480e7f2b7aa2aa5c8bf523387c4937441d8a
parent0147602c2bf1fff790b06295e6139117a381b206
parentafa53fe5d17f5ccf4bce9e3525d83696805098af
Merge branch 'na/no-http-test-in-the-middle'

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