Merge branch 'jk/test-httpd-config-nosystem'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:08 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:08 +0000 (11:39 -0700)
commit3e95e47...5d0a09593c9a9ac50f84d04de577c6b0
tree0683454...e96e9605863bb3de450d6f361a080442copy hash to clipboard (tree)
parentf4ee510...84e7c6a7b516f1db3817358ed38b4474copy hash to clipboard (diff)
parent1fad503...ad664e617eb05f778c83c1a75bddc8d8copy hash to clipboard (diff)
t/lib-httpd/apache.conf