Merge remote-tracking branch 'Rudloff/websurg'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 15 Oct 2013 00:11:33 +0000 (02:11 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 15 Oct 2013 00:11:33 +0000 (02:11 +0200)
1  2 
youtube_dl/extractor/__init__.py

Simple merge