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)
commit6e0c53649089732e59e45563d29784a01a499a06
treef3a470839ff8273c02dee41abeef07e4e53f2731
parentab82a818d2703a45a6b6588e5d2637f6045582bd
parent47839208d766c58178093a099fbdc75c5908543b
Merge branch 'setup_colors' into setup_app_name