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

index a19e85543d8f5435d7d1e9a1edd17332f17230ef,b689dc3c998d8dfb8a611a370d77d4365c573fa1..72523c54d31a4192700eab77bc9b83a241605853
@@@ -258,6 -258,7 +258,7 @@@ from .southparkstudios import 
  from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
+ from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
@@@ -266,12 -267,6 +267,12 @@@ from .streamcz import StreamCZI
  from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
 +from .tagesschau import TagesschauIE
 +from .teachertube import (
 +    TeacherTubeIE,
 +    TeacherTubeClassroomIE,
 +)
 +from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE