Merge branch 'master' of github.com:rg3/youtube-dl

diff --combined youtube_dl/extractor/__init__.py
index a56ec4fb5b5c877cdfce9cf0029edfd254b0eba8,0a5151d5a23ba1f31c8f8b92905324e4f3e8a0e1..e0c4a34865be8f70c8f6c54fe4e19390559d467e
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -122,6 -122,7 +122,7 @@@ from .flickr import FlickrI
  from .folketinget import FolketingetIE
  from .fourtube import FourTubeIE
  from .foxgay import FoxgayIE
+ from .foxnews import FoxNewsIE
  from .franceculture import FranceCultureIE
  from .franceinter import FranceInterIE
  from .francetv import (
@@@ -217,7 -218,6 +218,7 @@@ from .mdr import MDRI
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
 +from .minhateca import MinhatecaIE
  from .ministrygrid import MinistryGridIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mitele import MiTeleIE