Merge branch 'jn/maint-test-merge-verify-parents'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: bd9a2688454c09431101869e75c5a47f08c05b1a)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf