Merge branch 'vm/octopus-merge-bases-simplify'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 4243b2d1e45a8d0d9b1ccc9d860235e7b9543a7f)
-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