Merge branch 'maint-1.5.4' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 5736a3747120d6215de4fdfcf45f4a168a8d024e)
-rw-r--r-- 642 apache.conf
-rw-r--r-- 227 ssl.cnf