From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 15 Sep 2014 21:36:21 +0000 (+0200)
Subject: Merge remote-tracking branch '5moufl/behindkink'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=fc96eb4e2180d9a2371d84daa4305a5f34f12321;hp=-c

Merge remote-tracking branch '5moufl/behindkink'
---

fc96eb4e2180d9a2371d84daa4305a5f34f12321
diff --combined youtube_dl/extractor/__init__.py
index 4b83d8d99,5a02bea05..e9fceae4c
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -25,6 -25,7 +25,7 @@@ from .bambuser import BambuserIE, Bambu
  from .bandcamp import BandcampIE, BandcampAlbumIE
  from .bbccouk import BBCCoUkIE
  from .beeg import BeegIE
+ from .behindkink import BehindKinkIE
  from .bilibili import BiliBiliIE
  from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
@@@ -46,7 -47,6 +47,7 @@@ from .cinemassacre import CinemassacreI
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
 +from .cloudy import CloudyIE
  from .clubic import ClubicIE
  from .cmt import CMTIE
  from .cnet import CNETIE
@@@ -69,7 -69,6 +70,7 @@@ from .dailymotion import 
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
 +from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
@@@ -83,7 -82,6 +84,7 @@@ from .dropbox import DropboxI
  from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE
  from .eighttracks import EightTracksIE
 +from .einthusan import EinthusanIE
  from .eitb import EitbIE
  from .ellentv import (
      EllenTVIE,
@@@ -143,7 -141,6 +144,7 @@@ from .hark import HarkI
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
  from .hornbunny import HornBunnyIE
 +from .hostingbulk import HostingBulkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .howstuffworks import HowStuffWorksIE
@@@ -269,7 -266,6 +270,7 @@@ from .podomatic import PodomaticI
  from .pornhd import PornHdIE
  from .pornhub import PornHubIE
  from .pornotube import PornotubeIE
 +from .pornoxo import PornoXOIE
  from .promptfile import PromptFileIE
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
@@@ -328,7 -324,7 +329,7 @@@ from .southpark import 
  )
  from .space import SpaceIE
  from .spankwire import SpankwireIE
 -from .spiegel import SpiegelIE
 +from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .sportdeutschland import SportDeutschlandIE
@@@ -349,7 -345,6 +350,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
 +from .telemb import TeleMBIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE
  from .tf1 import TF1IE
@@@ -366,7 -361,6 +367,7 @@@ from .trutube import TruTubeI
  from .tube8 import Tube8IE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
 +from .turbo import TurboIE
  from .tutv import TutvIE
  from .tvigle import TvigleIE
  from .tvp import TvpIE