From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 1 Nov 2015 08:14:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
X-Git-Tag: beta-20151122~54
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ec83a9f100897cf93df8aba990ab348ddfaaf05e?hp=ec83a9f100897cf93df8aba990ab348ddfaaf05e

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