From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 7 Oct 2014 13:24:52 +0000 (+0700)
Subject: Merge branch 'walla' of https://github.com/lenaten/youtube-dl into lenaten-walla
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c59c3c84ede823e5c97f695ae904545c615e4ded;hp=-c;p=youtube-dl

Merge branch 'walla' of https://github.com/lenaten/youtube-dl into lenaten-walla
---

c59c3c84ede823e5c97f695ae904545c615e4ded
diff --combined youtube_dl/extractor/__init__.py
index d118daa68,b07c0b4cc..76726305a
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -134,16 -134,13 +134,16 @@@ from .gamestar import GameStarI
  from .gametrailers import GametrailersIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
 +from .globo import GloboIE
  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
@@@ -191,7 -188,6 +191,7 @@@ from .livestream import 
      LivestreamOriginalIE,
      LivestreamShortenerIE,
  )
 +from .lrt import LRTIE
  from .lynda import (
      LyndaIE,
      LyndaCourseIE
@@@ -265,7 -261,6 +265,7 @@@ from .nrk import 
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
 +from .oktoberfesttv import OktoberfestTVIE
  from .ooyala import OoyalaIE
  from .orf import (
      ORFTVthekIE,
@@@ -276,8 -271,6 +276,8 @@@ from .parliamentliveuk import Parliamen
  from .patreon import PatreonIE
  from .pbs import PBSIE
  from .photobucket import PhotobucketIE
 +from .planetaplay import PlanetaPlayIE
 +from .played import PlayedIE
  from .playfm import PlayFMIE
  from .playvid import PlayvidIE
  from .podomatic import PodomaticIE
@@@ -357,7 -350,6 +357,7 @@@ from .swrmediathek import SWRMediathekI
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
  from .tagesschau import TagesschauIE
 +from .tapely import TapelyIE
  from .teachertube import (
      TeacherTubeIE,
      TeacherTubeUserIE,
@@@ -371,15 -363,11 +371,15 @@@ from .tenplay import TenPlayI
  from .testurl import TestURLIE
  from .tf1 import TF1IE
  from .theplatform import ThePlatformIE
 +from .thesixtyone import TheSixtyOneIE
  from .thisav import ThisAVIE
  from .tinypic import TinyPicIE
  from .tlc import TlcIE, TlcDeIE
  from .tnaflix import TNAFlixIE
 -from .thvideo import THVideoIE
 +from .thvideo import (
 +    THVideoIE,
 +    THVideoPlaylistIE
 +)
  from .toutv import TouTvIE
  from .toypics import ToypicsUserIE, ToypicsIE
  from .traileraddict import TrailerAddictIE
@@@ -420,12 -408,11 +420,12 @@@ from .videoweed import VideoWeedI
  from .vidme import VidmeIE
  from .vimeo import (
      VimeoIE,
 -    VimeoChannelIE,
 -    VimeoUserIE,
      VimeoAlbumIE,
 +    VimeoChannelIE,
      VimeoGroupsIE,
 +    VimeoLikesIE,
      VimeoReviewIE,
 +    VimeoUserIE,
      VimeoWatchLaterIE,
  )
  from .vimple import VimpleIE
@@@ -440,6 -427,7 +440,7 @@@ from .vporn import VpornI
  from .vube import VubeIE
  from .vuclip import VuClipIE
  from .vulture import VultureIE
+ from .walla import WallaIE
  from .washingtonpost import WashingtonPostIE
  from .wat import WatIE
  from .wayofthemaster import WayOfTheMasterIE