From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 12 Jun 2015 09:12:54 +0000 (+0600)
Subject: Merge branch 'tvc' of https://github.com/hlintala/youtube-dl into hlintala-tvc
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=fff3455f58153879214c2f08b05de1555f9cc73a;hp=-c;p=youtube-dl

Merge branch 'tvc' of https://github.com/hlintala/youtube-dl into hlintala-tvc
---

fff3455f58153879214c2f08b05de1555f9cc73a
diff --combined youtube_dl/extractor/__init__.py
index 680d27d2d,8c4e12904..6dc3cbff4
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -229,7 -229,6 +229,7 @@@ from .infoq import InfoQI
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
 +from .iqiyi import IqiyiIE
  from .ivi import (
      IviIE,
      IviCompilationIE
@@@ -454,7 -453,6 +454,7 @@@ from .rutube import 
      RutubePersonIE,
  )
  from .rutv import RUTVIE
 +from .ruutu import RuutuIE
  from .sandia import SandiaIE
  from .safari import (
      SafariIE,
@@@ -584,6 -582,7 +584,7 @@@ from .tv2 import 
      TV2ArticleIE,
  )
  from .tv4 import TV4IE
+ from .tvc import TVCIE
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
  from .tvplay import TVPlayIE