Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Nov 2014 21:52:04 +0000 (22:52 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Nov 2014 21:52:04 +0000 (22:52 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge