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