Merge remote-tracking branch 'diffycat/jpopsuki'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 3 Jan 2014 11:20:18 +0000 (12:20 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 3 Jan 2014 11:20:18 +0000 (12:20 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge