From: masensio <masensio@solidgear.es>
Date: Tue, 22 Oct 2013 10:42:57 +0000 (+0200)
Subject: Merge branch 'setup_colors' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aabdaee86861832d15558f91f040479a1906beee?ds=inline;hp=-c

Merge branch 'setup_colors' into setup_app_name
---

aabdaee86861832d15558f91f040479a1906beee