From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 14 Aug 2015 13:39:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail
X-Git-Tag: beta-20151202~1^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c50aa8bc2ad90bad0e1f97a3a7bab461dc05b0d1?ds=inline;hp=c50aa8bc2ad90bad0e1f97a3a7bab461dc05b0d1

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