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