Merge remote-tracking branch 'jaimeMF/f4m'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --combined youtube_dl/extractor/__init__.py
index 3a8cd8a589b4aa7b8718e0d117c4cfd24a77ef36,97b53900c50924a47f17163dab063f09f7cb29f7..8715da7db50d8af6d1d0662468625e0cc60eeabb
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -32,10 -32,7 +32,10 @@@ from .clipfish import ClipfishI
  from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
  from .cmt import CMTIE
 -from .cnn import CNNIE
 +from .cnn import (
 +    CNNIE,
 +    CNNBlogsIE,
 +)
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
  from .condenast import CondeNastIE
@@@ -67,7 -64,6 +67,7 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .firstpost import FirstpostIE
 +from .firsttv import FirstTVIE
  from .fktv import (
      FKTVIE,
      FKTVPosteckeIE,
@@@ -119,7 -115,6 +119,7 @@@ from .keezmovies import KeezMoviesI
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
 +from .kontrtube import KontrTubeIE
  from .la7 import LA7IE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
@@@ -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
@@@ -230,7 -225,6 +231,7 @@@ from .ustream import UstreamIE, Ustream
  from .vbox7 import Vbox7IE
  from .veehd import VeeHDIE
  from .veoh import VeohIE
 +from .vesti import VestiIE
  from .vevo import VevoIE
  from .vice import ViceIE
  from .viddler import ViddlerIE