Merge branch 'rr/doc-merge-strategies'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 3e33860aa1c39429ebfe2542adf9011bd2c9aeba)
-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