Merge branch 'kb/p4merge'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 183f88018a849ae755b1efb7b63c58e38368e60f)
-rw-r--r-- 3095 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf