Merge branch 'feature-moz-colors' of https://github.com/xi/GMail-Conversation-View
Merge branch 'master' of github.com:protz/GMail-Conversation-View