From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 7 Jun 2014 13:20:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'pulpe/teachertube'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=24f5251cce172f0e403b4178819dd26b3873f021;p=youtube-dl

Merge remote-tracking branch 'pulpe/teachertube'

Conflicts:
	youtube_dl/extractor/__init__.py
---

24f5251cce172f0e403b4178819dd26b3873f021
diff --cc youtube_dl/extractor/__init__.py
index 32ef08c52,2ad1db555..a19e85543
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -266,8 -266,10 +266,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