From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 19 Aug 2015 17:56:08 +0000 (+0800)
Subject: Merge branch 'master' into HEAD
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=51047444aa6516b0062a3320625f67e3d4fe51d2;hp=-c;p=youtube-dl

Merge branch 'master' into HEAD
---

51047444aa6516b0062a3320625f67e3d4fe51d2
diff --combined youtube_dl/extractor/__init__.py
index 006ef3922,86ea0576a..1c53a5632
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -345,7 -345,6 +345,7 @@@ from .muenchentv import MuenchenTVI
  from .musicplayon import MusicPlayOnIE
  from .musicvault import MusicVaultIE
  from .muzu import MuzuTVIE
 +from .mwave import MwaveIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
  from .myvi import MyviIE
@@@ -359,6 -358,7 +359,7 @@@ from .nbc import 
      NBCNewsIE,
      NBCSportsIE,
      NBCSportsVPlayerIE,
+     MSNBCIE,
  )
  from .ndr import (
      NDRIE,
@@@ -613,7 -613,10 +614,10 @@@ from .testurl import TestURLI
  from .testtube import TestTubeIE
  from .tf1 import TF1IE
  from .theonion import TheOnionIE
- from .theplatform import ThePlatformIE
+ from .theplatform import (
+     ThePlatformIE,
+     ThePlatformFeedIE,
+ )
  from .thesixtyone import TheSixtyOneIE
  from .thisamericanlife import ThisAmericanLifeIE
  from .thisav import ThisAVIE
@@@ -697,6 -700,7 +701,6 @@@ from .vgtv import 
  from .vh1 import VH1IE
  from .vice import ViceIE
  from .viddler import ViddlerIE
 -from .videobam import VideoBamIE
  from .videodetective import VideoDetectiveIE
  from .videolecturesnet import VideoLecturesNetIE
  from .videofyme import VideofyMeIE