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