From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Apr 2015 12:08:20 +0000 (+0600)
Subject: Merge branch 'pornovoisines' of https://github.com/Roman2K/youtube-dl into Roman2K... 
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=d5c418f29fcce3d62bba7f6228b76b69b5b731ce;hp=-c;p=youtube-dl.git

Merge branch 'pornovoisines' of https://github.com/Roman2K/youtube-dl into Roman2K-pornovoisines
---

d5c418f29fcce3d62bba7f6228b76b69b5b731ce
diff --combined youtube_dl/extractor/__init__.py
index c05a43641,17d075ec8..0f7d44616
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -106,7 -106,6 +106,7 @@@ from .dbtv import DBTVI
  from .dctp import DctpTvIE
  from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
 +from .dhm import DHMIE
  from .dotsub import DotsubIE
  from .douyutv import DouyuTVIE
  from .dreisat import DreiSatIE
@@@ -115,7 -114,6 +115,7 @@@ from .drtuber import DrTuberI
  from .drtv import DRTVIE
  from .dvtv import DVTVIE
  from .dump import DumpIE
 +from .dumpert import DumpertIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
@@@ -177,7 -175,6 +177,7 @@@ from .gameone import 
      GameOneIE,
      GameOnePlaylistIE,
  )
 +from .gamersyde import GamersydeIE
  from .gamespot import GameSpotIE
  from .gamestar import GameStarIE
  from .gametrailers import GametrailersIE
@@@ -277,7 -274,6 +277,7 @@@ from .metacritic import MetacriticI
  from .mgoon import MgoonIE
  from .minhateca import MinhatecaIE
  from .ministrygrid import MinistryGridIE
 +from .miomio import MioMioIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mitele import MiTeleIE
  from .mixcloud import MixcloudIE
@@@ -313,8 -309,6 +313,8 @@@ from .nba import NBAI
  from .nbc import (
      NBCIE,
      NBCNewsIE,
 +    NBCSportsIE,
 +    NBCSportsVPlayerIE,
  )
  from .ndr import NDRIE
  from .ndtv import NDTVIE
@@@ -388,6 -382,7 +388,7 @@@ from .pornhub import 
      PornHubPlaylistIE,
  )
  from .pornotube import PornotubeIE
+ from .pornovoisines import PornoVoisinesIE
  from .pornoxo import PornoXOIE
  from .primesharetv import PrimeShareTVIE
  from .promptfile import PromptFileIE
@@@ -397,7 -392,6 +398,7 @@@ from .pyvideo import PyvideoI
  from .quickvid import QuickVidIE
  from .r7 import R7IE
  from .radiode import RadioDeIE
 +from .radiojavan import RadioJavanIE
  from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
  from .rai import RaiIE
@@@ -427,10 -421,6 +428,10 @@@ from .rutube import 
  )
  from .rutv import RUTVIE
  from .sandia import SandiaIE
 +from .safari import (
 +    SafariIE,
 +    SafariCourseIE,
 +)
  from .sapo import SapoIE
  from .savefrom import SaveFromIE
  from .sbs import SBSIE
@@@ -537,10 -527,6 +538,10 @@@ from .tvp import TvpIE, TvpSeriesI
  from .tvplay import TVPlayIE
  from .tweakers import TweakersIE
  from .twentyfourvideo import TwentyFourVideoIE
 +from .twentytwotracks import (
 +    TwentyTwoTracksIE,
 +    TwentyTwoTracksGenreIE
 +)
  from .twitch import (
      TwitchVideoIE,
      TwitchChapterIE,
@@@ -559,11 -545,9 +560,11 @@@ from .ultimedia import UltimediaI
  from .unistra import UnistraIE
  from .urort import UrortIE
  from .ustream import UstreamIE, UstreamChannelIE
 +from .varzesh3 import Varzesh3IE
  from .vbox7 import Vbox7IE
  from .veehd import VeeHDIE
  from .veoh import VeohIE
 +from .vessel import VesselIE
  from .vesti import VestiIE
  from .vevo import VevoIE
  from .vgtv import VGTVIE