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