Merge remote-tracking branch 'lenaten/karaoketv'

diff --cc youtube_dl/extractor/__init__.py
index fc83a7d07faf9d60dda75e268eef6f34fd5e4103,d12e741a0bd836858d8db31ddf0b32c13bfd9e2d..647e0a8c2fc5f0da5c3a9cc2ee49c6b6c6643f39
--- 1/youtube_dl/extractor/__init__.py
--- 2/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