...
linux freeze: Handle six.py
Fix cache bug that prevented recognizing different formats of the same book as being on the device. Also add an option to disable the cache.
Update Science Based News
Update dotNet Magazine
Update MIT Technology Review
Wireless driver: Fix bug that prevented different formats of the same book on the device from being recognized

Merge branch 'master' of https://github.com/cbhaley/calibre
Update Reuters (Japan)
PDF metadata: If one of the keywords in the PDF is a valid ISBN, use it as the ISBN for the book
PDF Output: Option to control title of generated Table of Contents

Fixes #1245076 [[Enhancement] Add PDF TOC Title, More Margin Options and ePub TOC Heading 1](https://bugs.launchpad.net/calibre/+bug/1245076)
Ebook viewer: remember inspector windows size

E-book viewer: Remember the size of the "Inspect" window used to examine
the book's code. Fixes #1245068 [Feature request: web inspector window size and font size](https://bugs.launchpad.net/calibre/+bug/1245068)
Driver for Lenovo IdeaPad

Fixes #1244857 [Lenovo android ideatab tablet not recognized](https://bugs.launchpad.net/calibre/+bug/1244857)
pep8
Option to check for duplicates while copying between libraries

Add an option to check for duplicates (books with the same title/author)
when copying between libraries. Option is under Preferences->Adding
books. Fixes #1245089 [When copying or moving book to different library, Calibre does not warn if possible duplicate exists in target library.](https://bugs.launchpad.net/calibre/+bug/1245089)
DOCX Input: Fix hyperlink showing as underlined even if the hyperlink style in word is set to not show underlines.
Merge pull request #1 from kovidgoyal/master

merge from mainstream