Merge remote-tracking branch 'akretz/youtube_fix'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:28:10 +0000 (16:28 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:28:10 +0000 (16:28 +0100)
1  2 
youtube_dl/extractor/youtube.py

Simple merge