From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Sep 2014 08:52:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'r4mos/played'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f0b8e3607db6bc2e7cdfcf3175e85d9bccb22229;hp=-c;p=youtube-dl

Merge remote-tracking branch 'r4mos/played'
---

f0b8e3607db6bc2e7cdfcf3175e85d9bccb22229
diff --combined youtube_dl/extractor/__init__.py
index 64dcb7225,9ee3f9190..6ab3eeaf5
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -135,14 -135,12 +135,14 @@@ from .gametrailers import GametrailersI
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .godtube import GodTubeIE
 +from .golem import GolemIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
  from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
  from .grooveshark import GroovesharkIE
  from .hark import HarkIE
 +from .heise import HeiseIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
  from .hornbunny import HornBunnyIE
@@@ -201,7 -199,6 +201,7 @@@ from .malemotion import MalemotionI
  from .mdr import MDRIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
 +from .mgoon import MgoonIE
  from .ministrygrid import MinistryGridIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mitele import MiTeleIE
@@@ -242,7 -239,6 +242,7 @@@ from .ndtv import NDTVI
  from .newgrounds import NewgroundsIE
  from .newstube import NewstubeIE
  from .nfb import NFBIE
 +from .nfl import NFLIE
  from .nhl import NHLIE, NHLVideocenterIE
  from .niconico import NiconicoIE
  from .ninegag import NineGagIE
@@@ -252,10 -248,7 +252,10 @@@ from .nosvideo import NosVideoI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 -from .npo import NPOIE
 +from .npo import (
 +    NPOIE,
 +    TegenlichtVproIE,
 +)
  from .nrk import (
      NRKIE,
      NRKTVIE,
@@@ -263,7 -256,6 +263,7 @@@
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
 +from .oktoberfesttv import OktoberfestTVIE
  from .ooyala import OoyalaIE
  from .orf import (
      ORFTVthekIE,
@@@ -274,6 -266,7 +274,7 @@@ from .parliamentliveuk import Parliamen
  from .patreon import PatreonIE
  from .pbs import PBSIE
  from .photobucket import PhotobucketIE
+ from .played import PlayedIE
  from .playfm import PlayFMIE
  from .playvid import PlayvidIE
  from .podomatic import PodomaticIE
@@@ -342,7 -335,6 +343,7 @@@ from .spankwire import SpankwireI
  from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
 +from .sport5 import Sport5IE
  from .sportdeutschland import SportDeutschlandIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
@@@ -370,7 -362,6 +371,7 @@@ from .thisav import ThisAVI
  from .tinypic import TinyPicIE
  from .tlc import TlcIE, TlcDeIE
  from .tnaflix import TNAFlixIE
 +from .thvideo import THVideoIE
  from .toutv import TouTvIE
  from .toypics import ToypicsUserIE, ToypicsIE
  from .traileraddict import TrailerAddictIE
@@@ -454,11 -445,9 +455,11 @@@ from .yahoo import 
      YahooNewsIE,
      YahooSearchIE,
  )
 +from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE
  from .youporn import YouPornIE
 +from .yourupload import YourUploadIE
  from .youtube import (
      YoutubeIE,
      YoutubeChannelIE,