From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 7 Jun 2014 13:15:39 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ac1390eee838d35b76d356e4e68bd430843d3439;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl

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

ac1390eee838d35b76d356e4e68bd430843d3439
diff --cc youtube_dl/extractor/__init__.py
index 4a640ab9c,1fba56405..32ef08c52
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -266,7 -266,7 +266,8 @@@ from .streamcz import StreamCZI
  from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
 +from .tagesschau import TagesschauIE
+ from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE