Merge remote-tracking branch 'capital-G/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 24 Oct 2014 13:02:50 +0000 (15:02 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 24 Oct 2014 13:02:50 +0000 (15:02 +0200)
1  2 
youtube_dl/extractor/__init__.py

Simple merge