From: tobiasKaminsky Date: Fri, 25 Sep 2015 15:23:31 +0000 (+0200) Subject: Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles X-Git-Tag: beta-20151122~4^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ff5202a5f6483e6082ec081ae0ec87f9eba4d967?hp=--cc Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles --- ff5202a5f6483e6082ec081ae0ec87f9eba4d967