From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 13:00:16 +0000 (+0200)
Subject: Merge branch 'setup_colors' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fc5608de767a9c45073b870e2e2860a012800f99

Merge branch 'setup_colors' into setup_app_name
---

fc5608de767a9c45073b870e2e2860a012800f99