Merge branch 'sb/maint-octopus' into maint-1.6.5
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 153559a964f436aeb909e3b7e86ceaa998aeed68)
-rw-r--r-- 850 apache.conf
-rw-r--r-- 227 ssl.cnf