From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 13 Sep 2015 12:01:55 +0000 (+0600)
Subject: Merge branch 'nowness' of https://github.com/remitamine/youtube-dl into remitamine... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d5d38d16ae434a65b4335616fc4617904f7ca34a;hp=-c;p=youtube-dl

Merge branch 'nowness' of https://github.com/remitamine/youtube-dl into remitamine-nowness
---

d5d38d16ae434a65b4335616fc4617904f7ca34a
diff --combined youtube_dl/extractor/__init__.py
index fadba905d,7408f68d6..99da52d96
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -347,6 -347,7 +347,6 @@@ from .mtv import 
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
 -from .musicvault import MusicVaultIE
  from .muzu import MuzuTVIE
  from .mwave import MwaveIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
@@@ -367,9 -368,6 +367,9 @@@ from .nbc import 
  from .ndr import (
      NDRIE,
      NJoyIE,
 +    NDREmbedBaseIE,
 +    NDREmbedIE,
 +    NJoyEmbedIE,
  )
  from .ndtv import NDTVIE
  from .netzkino import NetzkinoIE
@@@ -405,7 -403,11 +405,11 @@@ from .normalboots import NormalbootsI
  from .nosvideo import NosVideoIE
  from .nova import NovaIE
  from .novamov import NovaMovIE
- from .nowness import NownessIE
+ from .nowness import (
+     NownessIE,
+     NownessPlaylistIE,
+     NownessSerieIE,
+ )
  from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
@@@ -435,6 -437,7 +439,6 @@@ from .ooyala import 
      OoyalaIE,
      OoyalaExternalIE,
  )
 -from .openfilm import OpenFilmIE
  from .orf import (
      ORFTVthekIE,
      ORFOE1IE,