Fixed typo in diagnostic
Merge branch 'master' of https://github.com/kovidgoyal/calibre
Merge branch 'master' of https://github.com/kovidgoyal/calibre
Fix for lp:1241515, allow unicode catalog titles when saving presets.
Fix a bug with non-ascii text in the create catalog dialog

Fixes #1241515 [Create Catalog: Catalog title problems with special characters](https://bugs.launchpad.net/calibre/+bug/1241515)

Merge branch 'master' of https://github.com/GRiker/calibre
ODT Input: Handle ODT files that have custom DTDs in their meta.xml