From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 31 Oct 2015 07:48:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151122~66
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/495fd6e4041c6ed933022e49d1aee0a30a9d6f76?ds=sidebyside;hp=495fd6e4041c6ed933022e49d1aee0a30a9d6f76

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