From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 19:21:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151129~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4b9a2fa00f866b49c880d3eeb94c580ecad2f81c

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

4b9a2fa00f866b49c880d3eeb94c580ecad2f81c