From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Mon, 11 Apr 2016 08:17:05 +0000 (+0800)
Subject: Merge branch 'Phaeilo-presstv'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0f56bd2178d887adb2d5c61da44343d228eed504;hp=-c;p=youtube-dl

Merge branch 'Phaeilo-presstv'
---

0f56bd2178d887adb2d5c61da44343d228eed504
diff --combined youtube_dl/extractor/extractors.py
index c1a13c982,c2fa83918..c234ff127
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -123,7 -123,6 +123,7 @@@ from .chirbit import 
  )
  from .cinchcast import CinchcastIE
  from .cinemassacre import CinemassacreIE
 +from .cliprs import ClipRsIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
@@@ -584,6 -583,7 +584,7 @@@ from .pornhub import 
  from .pornotube import PornotubeIE
  from .pornovoisines import PornoVoisinesIE
  from .pornoxo import PornoXOIE
+ from .presstv import PressTVIE
  from .primesharetv import PrimeShareTVIE
  from .promptfile import PromptFileIE
  from .prosiebensat1 import ProSiebenSat1IE