From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 19 Aug 2015 17:24:33 +0000 (+0200)
Subject: Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid
X-Git-Tag: beta-20151122~25^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6af7d56a4250e339ffbfa1711b16bdd0a5e30e5b?ds=inline

Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid
---

6af7d56a4250e339ffbfa1711b16bdd0a5e30e5b