Merge branch 'sg/merge-options' (early part)
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: ca1c9913f8ac0ccaf976d44822076e1bba5bcd94)
-rw-r--r-- 642 apache.conf
-rw-r--r-- 227 ssl.cnf