Merge remote branch 'magnus/bug3644-normarc' into new/pending_qa/enh/bug_3644
[koha.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 623 README.txt
-rw-r--r-- 8517 koha-conf.xml
-rw-r--r-- 6470 koha-httpd.conf
drwxr-xr-x - pazpar2
drwxr-xr-x - zebradb