From: Philipp Hagemeister Date: Sat, 15 Feb 2014 14:32:13 +0000 (+0100) Subject: Merge remote-tracking branch 'jaimeMF/f4m' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4edff78531c42aa126b02a9b792f84d2775c2172;p=youtube-dl Merge remote-tracking branch 'jaimeMF/f4m' Conflicts: youtube_dl/extractor/__init__.py --- 4edff78531c42aa126b02a9b792f84d2775c2172 diff --cc youtube_dl/extractor/__init__.py index 3a8cd8a58,97b53900c..8715da7db --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -208,7 -203,7 +208,8 @@@ from .stanfordoc import StanfordOpenCla from .statigram import StatigramIE from .steam import SteamIE from .streamcloud import StreamcloudIE +from .streamcz import StreamCZIE + from .syfy import SyfyIE from .sztvhu import SztvHuIE from .teamcoco import TeamcocoIE from .techtalks import TechTalksIE