Merge remote-tracking branch 'diffycat/thvideo'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 21 Sep 2014 13:50:01 +0000 (15:50 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 21 Sep 2014 13:50:01 +0000 (15:50 +0200)
1  2 
youtube_dl/extractor/__init__.py

Simple merge