From: masensio <masensio@solidgear.es>
Date: Wed, 16 Sep 2015 10:55:45 +0000 (+0200)
Subject: Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8
X-Git-Tag: oc-android-1.8~1^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1bee51d2636615e25e74c65af838b89b3d68342a?ds=sidebyside;hp=--cc

Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8
---

1bee51d2636615e25e74c65af838b89b3d68342a