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

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