Merge branch 'jk/complete-merge-pull' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: ff7e96b78f3ad9db61fbdfdeaf7b71f254f76310)
-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