Merge branch 'maint-1.6.0' into maint-1.6.1
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: f054a419419337142ffe40433aa3984ccc000624)
-rw-r--r-- 732 apache.conf
-rw-r--r-- 227 ssl.cnf