Merge branch 'master' of koha-dev.rot13.org:/srv/koha-bibliografija