Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 16:02:14 +0000 (17:02 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 16:02:14 +0000 (17:02 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge