From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 27 Nov 2015 16:37:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151128~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a99a28cc61d48eca63803c3d661ea1be14f99aec?hp=a99a28cc61d48eca63803c3d661ea1be14f99aec

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