From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Dec 2015 19:28:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
X-Git-Tag: beta-20151202~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/deb1e48fc01a9750cc55429ff290e6f6ac025bf4?hp=deb1e48fc01a9750cc55429ff290e6f6ac025bf4

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