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

Trivial merge