Merge branch 'jk/maint-diff-grep-textconv' into maint
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 35cae74c4d38b79ca80f6e62761f64fa67e8e609)
-rw-r--r-- 2844 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf