From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 19:12:20 +0000 (+0100)
Subject: Merge branch 'beta' of github.com:owncloud/android into beta
X-Git-Tag: beta-20151129~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/26b1864940df7c02b1941355034fe83edd1d6bd2

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

26b1864940df7c02b1941355034fe83edd1d6bd2