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
Allow specifying arbitrary colors as hex triplets when creating custom columns with a fixed set of values. Fixes #1302078 [Allowing RGB colors for custom columns](https://bugs.launchpad.net/calibre/+bug/1302078)
Dont serialize alpha color component as the QColor constructor cannot handle them
Add Kovid's ColorButton to the advanced coloring rule editor
Merge branch 'master' of https://github.com/cbhaley/calibre
Add sample colored text to the list of column coloring rules
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
Merge branch 'master' of https://github.com/cbhaley/calibre
Edit book: Fix error when prettying HTML files that contain un-indented <script> or <style> tags