Merge branch 'karrierevideos' of https://github.com/misterhat/youtube-dl into misterh...

diff --combined youtube_dl/extractor/__init__.py
index 8bb3926a04312c7dd71476f061ccc72ffe559527,d131d3ec31645e30611be62180d95e488ebbdcc6..79bcd910666baf7a9802dc50f7ae072827976b52
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -244,6 -244,7 +244,7 @@@ from .kaltura import KalturaI
  from .kanalplay import KanalPlayIE
  from .kankan import KankanIE
  from .karaoketv import KaraoketvIE
+ from .karrierevideos import KarriereVideosIE
  from .keezmovies import KeezMoviesIE
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
@@@ -338,7 -339,8 +339,7 @@@ from .newstube import NewstubeI
  from .nextmedia import (
      NextMediaIE,
      NextMediaActionNewsIE,
 -    AppleDailyRealtimeNewsIE,
 -    AppleDailyAnimationNewsIE
 +    AppleDailyIE,
  )
  from .nfb import NFBIE
  from .nfl import NFLIE
@@@ -571,10 -573,7 +572,10 @@@ from .tumblr import TumblrI
  from .tunein import TuneInIE
  from .turbo import TurboIE
  from .tutv import TutvIE
 -from .tv2 import TV2IE
 +from .tv2 import (
 +    TV2IE,
 +    TV2ArticleIE,
 +)
  from .tv4 import TV4IE
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
@@@ -646,10 -645,7 +647,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
 -from .viki import VikiIE
 +from .viki import (
 +    VikiIE,
 +    VikiChannelIE,
 +)
  from .vk import (
      VKIE,
      VKUserVideosIE,