Merge branch 'jk/mergetool-lib-refactor'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 6f37238747002b8118d92bc0ec6c986a5d7e56ad)
-rw-r--r-- 4154 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf