From: remitamine <remitamine@gmail.com>
Date: Tue, 29 Dec 2015 16:29:55 +0000 (+0100)
Subject: Merge branch 'jukebox' of https://github.com/remitamine/youtube-dl into remitamine... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=06e4874c997fb523bd9d8e675d1ec0e69ab501ed

Merge branch 'jukebox' of https://github.com/remitamine/youtube-dl into remitamine-jukebox
---

06e4874c997fb523bd9d8e675d1ec0e69ab501ed
diff --cc youtube_dl/extractor/__init__.py
index e46d73ed7,1813c7e1b..75d191d5d
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -302,8 -262,6 +302,7 @@@ from .izlesene import IzleseneI
  from .jadorecettepub import JadoreCettePubIE
  from .jeuxvideo import JeuxVideoIE
  from .jove import JoveIE
- from .jukebox import JukeboxIE
 +from .jwplatform import JWPlatformIE
  from .jpopsukitv import JpopsukiIE
  from .kaltura import KalturaIE
  from .kanalplay import KanalPlayIE
diff --cc youtube_dl/extractor/generic.py
index 3c3066e38,4d1f75e63..70a8d8eb9
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -52,10 -50,7 +52,11 @@@ from .dailymotion import DailymotionClo
  from .onionstudios import OnionStudiosIE
  from .snagfilms import SnagFilmsEmbedIE
  from .screenwavemedia import ScreenwaveMediaIE
 +from .mtv import MTVServicesEmbeddedIE
 +from .pladform import PladformIE
 +from .googledrive import GoogleDriveIE
 +from .jwplatform import JWPlatformIE
+ from .ultimedia import UltimediaIE
  
  
  class GenericIE(InfoExtractor):