From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 21 Sep 2014 13:50:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'diffycat/thvideo'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=3ef7d11acdd7347f36b55b97930313fd26809c4d;p=youtube-dl

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

3ef7d11acdd7347f36b55b97930313fd26809c4d