From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:35:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
X-Git-Tag: beta-20151122~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/45e95d494dca25b857d15d384d6d0e1d4cbf2899?hp=45e95d494dca25b857d15d384d6d0e1d4cbf2899

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