From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 07:48:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
X-Git-Tag: beta-20151122~4^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2aac1e527034960dde1910fa5eaa88bc13dc2ee7?hp=2aac1e527034960dde1910fa5eaa88bc13dc2ee7

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