Merge remote-tracking branch 'pulpe/teachertube'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --cc youtube_dl/extractor/__init__.py
index 32ef08c52fd299c93264c84cc376b6359ce008fc,2ad1db555bef35610748b2b1ee996e175fcdd80e..a19e85543d8f5435d7d1e9a1edd17332f17230ef
--- 1/youtube_dl/extractor/__init__.py
--- 2/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