Merge remote-tracking branch 'Rudloff/canalc2'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Aug 2013 08:31:46 +0000 (10:31 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 27 Aug 2013 08:31:46 +0000 (10:31 +0200)
1  2 
youtube_dl/extractor/__init__.py

index fa53d9af9944c52c9c869e081fa669818c7ad874,576b8433a700ee240395510301517fe5a694c0fa..eeeb3db502eb9ddca980fbb690864557df8163d4
@@@ -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