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

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

03d2d6d51bc078b32c72fabc8be53807a0d5f925
diff --combined youtube_dl/extractor/__init__.py
index 09070daa4,72c5e4973..44a6d7484
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -82,6 -82,7 +82,7 @@@ from .crunchyroll import 
      CrunchyrollShowPlaylistIE
  )
  from .cspan import CSpanIE
+ from .ctsnews import CtsNewsIE
  from .dailymotion import (
      DailymotionIE,
      DailymotionPlaylistIE,
@@@ -546,7 -547,6 +547,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,