Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 14 Aug 2015 13:39:35 +0000 (15:39 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 14 Aug 2015 13:39:35 +0000 (15:39 +0200)

No differences found