Merge remote-tracking branch 'Rudloff/canalc2'

diff --combined youtube_dl/extractor/__init__.py
index fa53d9af9944c52c9c869e081fa669818c7ad874,576b8433a700ee240395510301517fe5a694c0fa..eeeb3db502eb9ddca980fbb690864557df8163d4
--- 1/youtube_dl/extractor/__init__.py
--- 2/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
@@@ -30,7 -30,6 +31,7 @@@ from .gametrailers import GametrailersI
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 +from .hark import HarkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .hypem import HypemIE
@@@ -59,7 -58,6 +60,7 @@@ from .pornotube import PornotubeI
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
 +from .ro220 import Ro220IE
  from .roxwel import RoxwelIE
  from .rtlnow import RTLnowIE
  from .sina import SinaIE
@@@ -74,11 -72,9 +75,11 @@@ from .ted import TEDI
  from .tf1 import TF1IE
  from .thisav import ThisAVIE
  from .traileraddict import TrailerAddictIE
 +from .trilulilu import TriluliluIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tutv import TutvIE
 +from .unistra import UnistraIE
  from .ustream import UstreamIE
  from .vbox7 import Vbox7IE
  from .veoh import VeohIE
@@@ -86,6 -82,7 +87,6 @@@ from .vevo import VevoI
  from .videofyme import VideofyMeIE
  from .vimeo import VimeoIE, VimeoChannelIE
  from .vine import VineIE
 -from .c56 import C56IE
  from .wat import WatIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
@@@ -119,14 -116,12 +120,14 @@@ _ALL_CLASSES = 
  ]
  _ALL_CLASSES.append(GenericIE)
  
 +
  def gen_extractors():
      """ Return a list of an instance of every supported extractor.
      The order does matter; the first extractor matched is the one handling the URL.
      """
      return [klass() for klass in _ALL_CLASSES]
  
 +
  def get_info_extractor(ie_name):
      """Returns the info extractor class with the given ie_name"""
      return globals()[ie_name+'IE']