Merge remote-tracking branch 'ckrooss/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 5 Jan 2015 17:07:16 +0000 (18:07 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 5 Jan 2015 17:07:16 +0000 (18:07 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge