From: masensio <masensio@solidgear.es>
Date: Mon, 24 Aug 2015 11:07:31 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: oc-android-1.8~34
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b572e4b935dc5cfc0f20af2b7104146a180fa5de?ds=inline;hp=--cc

Merge branch 'develop'
---

b572e4b935dc5cfc0f20af2b7104146a180fa5de