Merge branch 'maint-1.7.0' into maint-1.7.1
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 567323d387dda559dbdba8c15453aba629393955)
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf