Merge remote-tracking branch 'fiocfun/toypics-support'

diff --combined youtube_dl/extractor/__init__.py
index d828c6932e40d09bd1de5ce852a0c8748dad3734,06eac56e5fd8e8382f0fb42de8a6080b5bc8cb1b..5ca6eb16cb370434dea85b3f57a6f3bf365cf686
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -2,7 -2,6 +2,7 @@@ from .academicearth import AcademicEart
  from .addanime import AddAnimeIE
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
 +from .aol import AolIE
  from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
@@@ -65,7 -64,6 +65,7 @@@ from .ehow import EHowI
  from .eighttracks import EightTracksIE
  from .eitb import EitbIE
  from .elpais import ElPaisIE
 +from .engadget import EngadgetIE
  from .escapist import EscapistIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
@@@ -74,7 -72,6 +74,7 @@@ from .facebook import FacebookI
  from .faz import FazIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
 +from .fivemin import FiveMinIE
  from .fktv import (
      FKTVIE,
      FKTVPosteckeIE,
@@@ -239,6 -236,7 +239,7 @@@ from .theplatform import ThePlatformI
  from .thisav import ThisAVIE
  from .tinypic import TinyPicIE
  from .toutv import TouTvIE
+ from .toypics import ToypicsIE
  from .traileraddict import TrailerAddictIE
  from .trilulilu import TriluliluIE
  from .trutube import TruTubeIE