Merge branch 'bm/merge-base-octopus-dedup'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: d5d1678b9c675a97b3ec3aaf843d02b1cf536c74)
-rw-r--r-- 4530 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf