From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Dec 2015 19:25:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151202~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7326405ebb29a640388ebb9d782986ebf12e865f

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

7326405ebb29a640388ebb9d782986ebf12e865f