Merge branch 'setup_colors' into setup_app_name
authormasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 10:42:57 +0000 (12:42 +0200)
committermasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 10:42:57 +0000 (12:42 +0200)

Trivial merge