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

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