From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 2 Nov 2015 19:10:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/beta' into beta
X-Git-Tag: beta-20151122~45^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c43335f474f302dffbf17675904e83675967c196?ds=inline

Merge remote-tracking branch 'upstream/beta' into beta
---

c43335f474f302dffbf17675904e83675967c196