From: tobiasKaminsky Date: Tue, 27 Oct 2015 20:24:36 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/master' into animatedGif X-Git-Tag: beta-20151122~97^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a7c041ce0034cc3b7b02f71357463e8ba9b142ee?hp=--cc Merge remote-tracking branch 'remotes/upstream/master' into animatedGif --- a7c041ce0034cc3b7b02f71357463e8ba9b142ee