Merge remote-tracking branch 'pulpe/teachertube'

Conflicts: youtube_dl/extractor/__init__.py
2014-06-07 15:20:12 +02:00
parent ac1390eee8 b4e7447458
commit 24f5251cce
3 changed files with 98 additions and 0 deletions
--- a/youtube_dl/extractor/init.py
+++ b/youtube_dl/extractor/init.py
@ -267,6 +267,10 @@ 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