Fixed typo in diagnostic
Merge branch 'master' of https://github.com/kovidgoyal/calibre
...
Confirm on quit if unsaved changes present
Sort non spine items in the file list
Fix #1240644 [Chapter threshold maximum of 99 is insufficient](https://bugs.launchpad.net/calibre/+bug/1240644)
Update Newsweek Polska
Conversion: Handle embed font family and filter css conflict

Conversion: If both embed font family and the filter css option to
remove fonts are set, do not remove the font specified by the embed font
family option.
Fix custom device driver swap main and card option not working
Windows: Check if the books' files are in use before deleting

Fixes #1240788 [Calibre refused to delete book](https://bugs.launchpad.net/calibre/+bug/1240788)
Fix typos in linux_swap_drives() in a few other devices
Update WSJ some more
Printout tracebacks in debug mode for exception during template processing
Make deleting to recycle bin more robust

Make deleting books to recycle bin more robust. Ensure that the
temporary directory created during the move to recycle bin process is
not left behind in case of errors.
Fix a few remaining downgrade locking errors

Fix a few remaining call sites that could generate downgrade lock
errors. Also speed up locking a little by aliasing the __enter__ and
__exit__ methods on the wrapper lock object instead of wrapping them.
...
Fix dump and restore not working on windows
Tolino driver: Add an option to swap the main memory and card in calibre

Fixes #1240504 [Tolino Shine: Please change (again, sorry) device order](https://bugs.launchpad.net/calibre/+bug/1240504)
Fix bug in handling change of filename but not foldername

Fix a bug triggered in very special circumstances (primarily on windows)
that could cause duplicate files entries (hard links) to be created for
a books' files when changing the title and author. The bug was triggered
only if the title or author were between 32 and 35 characters in length
and the book entry had originally been created by a pre 1.x version of
calibre.
Refactor out the code to get windows file ids