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