From: masensio <masensio@solidgear.es>
Date: Mon, 24 Aug 2015 10:42:25 +0000 (+0200)
Subject: Merge branch 'master' of github.com:owncloud/android
X-Git-Tag: oc-android-1.8~36
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9849205124c3c6f7cc44afcf5ba777a0895435bf

Merge branch 'master' of github.com:owncloud/android
---

9849205124c3c6f7cc44afcf5ba777a0895435bf