From: masensio <masensio@solidgear.es>
Date: Mon, 24 Aug 2015 11:01:12 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: oc-android-1.8~35
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/83442c8ded183be69e5433d3f4238da20b75be40?hp=-c

Merge branch 'develop'
---

83442c8ded183be69e5433d3f4238da20b75be40