Added OPML support to the user_profile dialog
Removed old code from the OPML plugin
When adding the same OPML file, the "replace recipe?" question_dialog will now pop up
until you say "That's enough, mister!"
The 'Replace recipe?' question_dialog preference gets saved.
The 'Replace recipe?' question_dialog preference gets saved.
Merge branch 'master' of https://github.com/ingkebil/calibre
Merge branch 'master' of https://github.com/kovidgoyal/calibre
Adding of multiple recipes now goes lightning fast
Merge branch 'master' of https://github.com/kovidgoyal/calibre
When replacing multiple recipes, get_custom_recipe_collection is now
only called once.
Resized the OPML icon a bit
Renamed the button from OPML to RSS feeds import.

Sounds more descriptive this way.
Removed some old plugin code
Content server; Fix page not found error when clicking on a category that has only a single item in it

Merge branch 'master' of https://github.com/cbhaley/calibre
DOCX Input: Dont fail on DOCX files that contain pages with zero effective width. Fixes #1303022 [Private bug](https://bugs.launchpad.net/calibre/+bug/1303022)
Added some i18n.
Edit metadata dialog: Remember window size for the cover download window
Ensure that the rendered dates are always in the same language as the calibre interface, regardless of system language setting
Fix #1303181 [ebook-device cp -f gives exits with error when trying to copy to kindle](https://bugs.launchpad.net/calibre/+bug/1303181)
Fix #1303331 [News source "NRC Handelsblad" nrc-nl-epub.recipe download URL changed](https://bugs.launchpad.net/calibre/+bug/1303331)