From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 16:59:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'lenaten/karaoketv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=bc694039e47cc871c98abacdf1c0a2e5a257a8a4

Merge remote-tracking branch 'lenaten/karaoketv'
---

bc694039e47cc871c98abacdf1c0a2e5a257a8a4
diff --cc youtube_dl/extractor/__init__.py
index fc83a7d07,d12e741a0..647e0a8c2
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -205,8 -170,10 +205,9 @@@ from .jadorecettepub import JadoreCette
  from .jeuxvideo import JeuxVideoIE
  from .jove import JoveIE
  from .jukebox import JukeboxIE
 -from .justintv import JustinTVIE
  from .jpopsukitv import JpopsukiIE
  from .kankan import KankanIE
+ from .karaoketv import KaraoketvIE
  from .keezmovies import KeezMoviesIE
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE