From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:49:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
X-Git-Tag: beta-20151122~82
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cc05129c903b9e6bb7e00af479cb61ce203d3b63?hp=cc05129c903b9e6bb7e00af479cb61ce203d3b63

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