Merge remote-tracking branch 'zackfern/myvidster'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 07:30:22 +0000 (08:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 07:30:22 +0000 (08:30 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge