Merge remote-tracking branch 'diffycat/thvideo-update'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 28 Sep 2014 22:36:55 +0000 (00:36 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 28 Sep 2014 22:36:55 +0000 (00:36 +0200)

Trivial merge