From: remitamine <remitamine@gmail.com>
Date: Sat, 5 Mar 2016 17:35:48 +0000 (+0100)
Subject: Merge pull request #8754 from remitamine/5min
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=a9793f58a1971e3f458be01200df485f4e9b0bda;hp=-c;p=youtube-dl

Merge pull request #8754 from remitamine/5min

update 5min related web sites info extraction and add support for Aol features.
---

a9793f58a1971e3f458be01200df485f4e9b0bda
diff --combined youtube_dl/extractor/__init__.py
index 08b3dc673,db1827666..899bf8114
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -23,7 -23,10 +23,10 @@@ from .alphaporno import AlphaPornoI
  from .animeondemand import AnimeOnDemandIE
  from .anitube import AnitubeIE
  from .anysex import AnySexIE
- from .aol import AolIE
+ from .aol import (
+     AolIE,
+     AolFeaturesIE,
+ )
  from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appleconnect import AppleConnectIE
@@@ -340,7 -343,6 +343,7 @@@ from .konserthusetplay import Konserthu
  from .kontrtube import KontrTubeIE
  from .krasview import KrasViewIE
  from .ku6 import Ku6IE
 +from .kusi import KUSIIE
  from .kuwo import (
      KuwoIE,
      KuwoAlbumIE,