From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 11 Oct 2013 17:53:27 +0000 (+0200)
Subject: Merge branch 'cinemassacre' of github.com:rzhxeo/youtube-dl into rzhxeo-cinemassacre
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=d2f9cdb2058fe3530ba42ba26fe843fb94021f70;hp=-c;p=youtube-dl.git

Merge branch 'cinemassacre' of github.com:rzhxeo/youtube-dl into rzhxeo-cinemassacre
---

d2f9cdb2058fe3530ba42ba26fe843fb94021f70
diff --combined youtube_dl/extractor/__init__.py
index 688196869,db30edc27..226c3a762
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -12,6 -12,7 +12,7 @@@ from .brightcove import BrightcoveI
  from .c56 import C56IE
  from .canalplus import CanalplusIE
  from .canalc2 import Canalc2IE
+ from .cinemassacre import CinemassacreIE
  from .cnn import CNNIE
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE
@@@ -34,7 -35,6 +35,7 @@@ from .eighttracks import EightTracksI
  from .escapist import EscapistIE
  from .exfm import ExfmIE
  from .facebook import FacebookIE
 +from .faz import FazIE
  from .fktv import (
      FKTVIE,
      FKTVPosteckeIE,
@@@ -81,7 -81,6 +82,7 @@@ from .naver import NaverI
  from .nba import NBAIE
  from .nbc import NBCNewsIE
  from .newgrounds import NewgroundsIE
 +from .nhl import NHLIE, NHLVideocenterIE
  from .ooyala import OoyalaIE
  from .orf import ORFIE
  from .pbs import PBSIE
@@@ -119,7 -118,6 +120,7 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vevo import VevoIE
  from .vice import ViceIE
 +from .viddler import ViddlerIE
  from .videofyme import VideofyMeIE
  from .vimeo import VimeoIE, VimeoChannelIE
  from .vine import VineIE
@@@ -143,7 -141,6 +144,7 @@@ from .youtube import 
      YoutubeShowIE,
      YoutubeSubscriptionsIE,
      YoutubeRecommendedIE,
 +    YoutubeTruncatedURLIE,
      YoutubeWatchLaterIE,
      YoutubeFavouritesIE,
  )