From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 3 Jan 2014 11:20:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'diffycat/jpopsuki'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d2fee313ec71ad8a4d8b57ec9f433210ee01056b;hp=-c;p=youtube-dl

Merge remote-tracking branch 'diffycat/jpopsuki'
---

d2fee313ec71ad8a4d8b57ec9f433210ee01056b
diff --combined youtube_dl/extractor/__init__.py
index 5319a9292,b59110b15..9c1374373
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -28,7 -28,6 +28,7 @@@ from .channel9 import Channel9I
  from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
  from .clipsyndicate import ClipsyndicateIE
 +from .cmt import CMTIE
  from .cnn import CNNIE
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
@@@ -80,10 -79,7 +80,10 @@@ from .hotnewhiphop import HotNewHipHopI
  from .howcast import HowcastIE
  from .hypem import HypemIE
  from .ign import IGNIE, OneUPIE
 -from .imdb import ImdbIE
 +from .imdb import (
 +    ImdbIE,
 +    ImdbListIE
 +)
  from .ina import InaIE
  from .infoq import InfoQIE
  from .instagram import InstagramIE
@@@ -95,6 -91,7 +95,7 @@@ from .ivi import 
  from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE
+ from .jpopsukitv import JpopsukiIE
  from .kankan import KankanIE
  from .keezmovies import KeezMoviesIE
  from .kickstarter import KickStarterIE