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)
commit4e0fb1280a8c1b392e5ce71aff796c94a12976a0
tree43536b82543ce1ae29febbc9443cbe479caa7b0d
parent24f5251cce172f0e403b4178819dd26b3873f021
parentdf53a98f2ba7d628d66189ea2733271a1da5a6ad
Merge remote-tracking branch 'georgjaehnig/spiegeltv'
youtube_dl/extractor/__init__.py