From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 7 Jun 2014 13:21:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'georgjaehnig/spiegeltv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4e0fb1280a8c1b392e5ce71aff796c94a12976a0;hp=-c;p=youtube-dl

Merge remote-tracking branch 'georgjaehnig/spiegeltv'
---

4e0fb1280a8c1b392e5ce71aff796c94a12976a0
diff --combined youtube_dl/extractor/__init__.py
index a19e85543,b689dc3c9..72523c54d
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -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