From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 25 Jun 2015 12:43:04 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.7.2
X-Git-Tag: oc-android-1.7.2~1^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9babe1b38cd2b9e5a19a0bc81eb00d4336a2a6ec?ds=inline

Merge branch 'develop' into release-1.7.2
---

9babe1b38cd2b9e5a19a0bc81eb00d4336a2a6ec