From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Sep 2014 22:36:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'diffycat/thvideo-update'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=457ac58cc72a0b7161a0369a8f282f38ff0f2f93;p=youtube-dl

Merge remote-tracking branch 'diffycat/thvideo-update'
---

457ac58cc72a0b7161a0369a8f282f38ff0f2f93