]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'Huarong/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 11:10:59 +0000 (13:10 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 28 Aug 2013 11:10:59 +0000 (13:10 +0200)
1  2 
youtube_dl/extractor/__init__.py

index 21e9e5d37234a9535555fcdc6e1df3a67e764073,3a08d676fb40db39f09f1c2eb09618b0516552f0..6b5037c8c18092c8fdafd3675b0baa9d1327cadd
@@@ -65,11 -53,9 +65,12 @@@ from .pornotube import PornotubeI
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
 +from .ro220 import Ro220IE
  from .roxwel import RoxwelIE
 +from .rtlnow import RTLnowIE
  from .sina import SinaIE
 +from .slashdot import SlashdotIE
+ from .sohu import SohuIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE
  from .spiegel import SpiegelIE
  from .stanfordoc import StanfordOpenClassroomIE