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