Merge remote-tracking branch 'origin/new/bug_6858'
[srvgit] / misc / admin /
drwxr-xr-x   ..
-rwxr-xr-x 8703 koha-preferences