From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 11 Jul 2014 08:54:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'pachacamac/vodlocker'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;ds=inline;h=c09cbf0ed91ed54882abe6633b1e70e8a8b7db2d;hp=-c;p=youtube-dl

Merge remote-tracking branch 'pachacamac/vodlocker'
---

c09cbf0ed91ed54882abe6633b1e70e8a8b7db2d
diff --combined youtube_dl/extractor/__init__.py
index 12cca5c2e,1666aa372..7b3f9ae24
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -3,7 -3,6 +3,7 @@@ from .addanime import AddAnimeI
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
  from .aol import AolIE
 +from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
@@@ -64,7 -63,6 +64,7 @@@ from .dailymotion import 
  from .daum import DaumIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
 +from .drtv import DRTVIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
@@@ -149,11 -147,7 +149,11 @@@ from .ku6 import Ku6I
  from .la7 import LA7IE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
 -from .livestream import LivestreamIE, LivestreamOriginalIE
 +from .livestream import (
 +    LivestreamIE,
 +    LivestreamOriginalIE,
 +    LivestreamShortenerIE,
 +)
  from .lynda import (
      LyndaIE,
      LyndaCourseIE
@@@ -171,7 -165,6 +171,7 @@@ from .mpora import MporaI
  from .mofosex import MofosexIE
  from .mooshare import MooshareIE
  from .morningstar import MorningstarIE
 +from .motherless import MotherlessIE
  from .motorsport import MotorsportIE
  from .moviezine import MoviezineIE
  from .movshare import MovShareIE
@@@ -204,7 -197,6 +204,7 @@@ from .normalboots import NormalbootsI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 +from .npo import NPOIE
  from .nrk import (
      NRKIE,
      NRKTVIE,
@@@ -263,7 -255,6 +263,7 @@@ from .soundcloud import 
      SoundcloudUserIE,
      SoundcloudPlaylistIE
  )
 +from .soundgasm import SoundgasmIE
  from .southparkstudios import (
      SouthParkStudiosIE,
      SouthparkDeIE,
@@@ -283,7 -274,7 +283,7 @@@ from .sztvhu import SztvHuI
  from .tagesschau import TagesschauIE
  from .teachertube import (
      TeacherTubeIE,
 -    TeacherTubeClassroomIE,
 +    TeacherTubeUserIE,
  )
  from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
@@@ -342,6 -333,7 +342,7 @@@ from .vine import 
  )
  from .viki import VikiIE
  from .vk import VKIE
+ from .vodlocker import VodlockerIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
  from .vulture import VultureIE