From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 22 Nov 2015 11:19:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
X-Git-Tag: beta-20151124~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0bd47a3fb5629f49bbcb72f7860a7fefcf17c9c0?ds=inline

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

0bd47a3fb5629f49bbcb72f7860a7fefcf17c9c0