Make the list of color names tooltip appear when creating an enum column as well as when editing one.
Merge branch 'master' of https://github.com/cbhaley/calibre
Allow specifying arbitrary colors for column coloring rules
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/cbhaley/calibre
Edit book: Fix error when prettying HTML files that contain un-indented <script> or <style> tags
Send books to the Books folder for the Tolino Vision
Update Frontline
Fix content server internal redirects not unquoting the category.

See http://www.mobileread.com/forums/showthread.php?t=236441 for some context.

Although the fix works, I am not sure that this is the right way to fix it. I am not familiar enough with the routing system to know if there is a single place somewhere that is missing the unquote.
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)
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)
Edit Book: Saved searches dialog: Make the option to control where to search a little more prominent