From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 30 Jan 2015 02:09:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'yan12125/IE_NextMedia'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=02c1d5e285e5d6c7f1a671610170526ab3ef8bd6;hp=-c;p=youtube-dl

Merge remote-tracking branch 'yan12125/IE_NextMedia'
---

02c1d5e285e5d6c7f1a671610170526ab3ef8bd6
diff --combined youtube_dl/extractor/__init__.py
index 44a6d7484,444af8b6e..ad4ed103b
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -82,7 -82,6 +82,7 @@@ from .crunchyroll import 
      CrunchyrollShowPlaylistIE
  )
  from .cspan import CSpanIE
 +from .ctsnews import CtsNewsIE
  from .dailymotion import (
      DailymotionIE,
      DailymotionPlaylistIE,
@@@ -285,6 -284,12 +285,12 @@@ from .netzkino import NetzkinoI
  from .nerdcubed import NerdCubedFeedIE
  from .newgrounds import NewgroundsIE
  from .newstube import NewstubeIE
+ from .nextmedia import (
+     NextMediaIE,
+     NextMediaActionNewsIE,
+     AppleDailyRealtimeNewsIE,
+     AppleDailyAnimationNewsIE
+ )
  from .nfb import NFBIE
  from .nfl import NFLIE
  from .nhl import NHLIE, NHLVideocenterIE
@@@ -547,7 -552,6 +553,7 @@@ from .xminus import XMinusI
  from .xnxx import XNXXIE
  from .xvideos import XVideosIE
  from .xtube import XTubeUserIE, XTubeIE
 +from .xuite import XuiteIE
  from .xxxymovies import XXXYMoviesIE
  from .yahoo import (
      YahooIE,