]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge remote-tracking branch 'jaimeMF/f4m'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 15 Feb 2014 14:32:13 +0000 (15:32 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 15 Feb 2014 14:32:13 +0000 (15:32 +0100)
Conflicts:
youtube_dl/extractor/__init__.py

1  2 
youtube_dl/extractor/__init__.py

index 3a8cd8a589b4aa7b8718e0d117c4cfd24a77ef36,97b53900c50924a47f17163dab063f09f7cb29f7..8715da7db50d8af6d1d0662468625e0cc60eeabb
@@@ -208,7 -203,7 +208,8 @@@ from .stanfordoc import StanfordOpenCla
  from .statigram import StatigramIE
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
 +from .streamcz import StreamCZIE
+ from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE