Merge remote-tracking branch 'georgjaehnig/spiegeltv'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 13:21:33 +0000 (15:21 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 13:21:33 +0000 (15:21 +0200)
1  2 
youtube_dl/extractor/__init__.py

Simple merge