From: Philipp Hagemeister Date: Tue, 27 Aug 2013 08:31:46 +0000 (+0200) Subject: Merge remote-tracking branch 'Rudloff/canalc2' X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=aa5a63a5b54fe26654eb91005025d91237b39c64;p=youtube-dl Merge remote-tracking branch 'Rudloff/canalc2' --- aa5a63a5b54fe26654eb91005025d91237b39c64 diff --cc youtube_dl/extractor/__init__.py index fa53d9af9,576b8433a..eeeb3db50 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -6,8 -6,8 +6,9 @@@ from .bandcamp import BandcampI from .bliptv import BlipTVIE, BlipTVUserIE from .breakcom import BreakIE from .brightcove import BrightcoveIE +from .c56 import C56IE from .canalplus import CanalplusIE + from .canalc2 import Canalc2IE from .collegehumor import CollegeHumorIE from .comedycentral import ComedyCentralIE from .condenast import CondeNastIE