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