Merge branch 'jc/ll-merge-binary-ours' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 8c4bcd34bd194d7932a153f464cbc6ada7b27b46)
-rw-r--r-- 2844 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf