From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 31 Oct 2015 07:37:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151122~67
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1998cc68d6586c6a0b4bc4c9be42b48d17fa5ba7

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

1998cc68d6586c6a0b4bc4c9be42b48d17fa5ba7