From: jabarros Date: Tue, 20 Jan 2015 08:25:20 +0000 (+0100) Subject: Merge branch 'develop' into SettingsGreyedOut X-Git-Tag: oc-android-1.7.0_signed~32^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d0cee8be8556d1db46ec6193b209f9ffdae104d0 Merge branch 'develop' into SettingsGreyedOut --- d0cee8be8556d1db46ec6193b209f9ffdae104d0