From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 30 May 2015 15:33:10 +0000 (+0800)
Subject: Merge branch 'porn91' of https://github.com/PeterDing/youtube-dl into PeterDing-porn91
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1ebc05df91b769452da50c5fad0b413550d5e1de;hp=-c;p=youtube-dl

Merge branch 'porn91' of https://github.com/PeterDing/youtube-dl into PeterDing-porn91
---

1ebc05df91b769452da50c5fad0b413550d5e1de
diff --combined youtube_dl/extractor/__init__.py
index e7e0a55f2,d20ad286d..4dc07efe0
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -354,7 -354,6 +354,7 @@@ from .normalboots import NormalbootsI
  from .nosvideo import NosVideoIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
 +from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
@@@ -401,6 -400,7 +401,7 @@@ from .playfm import PlayFMI
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
  from .podomatic import PodomaticIE
+ from .porn91 import Porn91IE
  from .pornhd import PornHdIE
  from .pornhub import (
      PornHubIE,
@@@ -438,6 -438,7 +439,6 @@@ from .roxwel import RoxwelI
  from .rtbf import RTBFIE
  from .rte import RteIE
  from .rtlnl import RtlNlIE
 -from .rtlnow import RTLnowIE
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
@@@ -480,10 -481,6 +481,10 @@@ from .smotri import 
  )
  from .snotr import SnotrIE
  from .sohu import SohuIE
 +from .soompi import (
 +    SoompiIE,
 +    SoompiShowIE,
 +)
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
@@@ -569,7 -566,6 +570,7 @@@ from .traileraddict import TrailerAddic
  from .trilulilu import TriluliluIE
  from .trutube import TruTubeIE
  from .tube8 import Tube8IE
 +from .tubitv import TubiTvIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tunein import TuneInIE