From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 18 Nov 2015 12:19:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/beta' into beta
X-Git-Tag: beta-20151122~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/87db47a9004f1fe55032793069b498c6c5dc2e93?ds=inline;hp=--cc

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

87db47a9004f1fe55032793069b498c6c5dc2e93