Merge branch 'jc/merge-bases-paint-fix'
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 683a820d511b3a05ea997fb4a83e78d65b623293)
-rw-r--r-- 2844 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf