Merge branch 'jk/test-httpd-config-nosystem' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:17 +0000 (18:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:17 +0000 (18:37 -0700)
commitb5d7308...80dd02fe6c077961e16c6a91edd7c19d
tree9914964...fefd4c006a8c6155651999ea22b43033copy hash to clipboard (tree)
parent5859f04...0807264c03951a2e7be9192e00487039copy hash to clipboard (diff)
parent1fad503...ad664e617eb05f778c83c1a75bddc8d8copy hash to clipboard (diff)
t/lib-httpd/apache.conf