Merge branch 'new/bug11269' into 3.14.x
[koha_fer] / misc / admin /
drwxr-xr-x   ..
-rwxr-xr-x 8703 koha-preferences