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