From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 25 Jul 2015 10:36:04 +0000 (+0800)
Subject: Merge branch 'ir90tv' of https://github.com/cyb3r/youtube-dl into cyb3r-ir90tv
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=a56c1e38c77bdeae38143b057b1698a5ffb2b914

Merge branch 'ir90tv' of https://github.com/cyb3r/youtube-dl into cyb3r-ir90tv
---

a56c1e38c77bdeae38143b057b1698a5ffb2b914
diff --cc youtube_dl/extractor/__init__.py
index 3cfa804ec,ee05a6958..ec4c017f3
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -242,7 -229,7 +242,8 @@@ from .infoq import InfoQI
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
 +from .iqiyi import IqiyiIE
+ from .ir90tv import Ir90TvIE
  from .ivi import (
      IviIE,
      IviCompilationIE