Merge branch 'setup_colors' into setup_app_name
authormasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 09:47:15 +0000 (11:47 +0200)
committermasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 09:47:15 +0000 (11:47 +0200)

Trivial merge