Merge branch 'master' of github.com:dpavlin/Biblio-Z3950