Merge remote-tracking branch 'naglis/nosvideo'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Sep 2014 22:14:58 +0000 (00:14 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Sep 2014 22:14:58 +0000 (00:14 +0200)
1  2 
youtube_dl/extractor/__init__.py

Simple merge