From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 5 Jul 2013 09:52:24 +0000 (+0200)
Subject: Merge branch 'develop' into branding_configurable_URL_input_field
X-Git-Tag: oc-android-1.4.3~5^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/233533faa3f74a0a82ace5191c81a3211658a62b?ds=inline;hp=233533faa3f74a0a82ace5191c81a3211658a62b

Merge branch 'develop' into branding_configurable_URL_input_field
---