Merge remote-tracking branch 'origin/new/bug_7083'
[koha_fer] / Koha /
drwxr-xr-x   ..
drwxr-xr-x - Template