Merge branch 'jk/merge-tree-added-identically'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c)
-rw-r--r-- 3689 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf