From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:52:18 +0000 (+0100)
Subject: Merge branch 'beta' of github.com:owncloud/android into beta
X-Git-Tag: beta-20151122~19
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/420051123c0d61b987f9427c2531b544dd2f68c0?ds=inline;hp=--cc

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

420051123c0d61b987f9427c2531b544dd2f68c0