From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 30 Nov 2015 20:48:06 +0000 (+0100)
Subject: Merge branch 'beta' of github.com:owncloud/android into beta
X-Git-Tag: beta-20151202~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9fec706b31cad885e3b9dd72c68750aeebd6f464

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

9fec706b31cad885e3b9dd72c68750aeebd6f464