Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 87d99c64dfa8880592104245896557aa530d4fd9)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf