From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 1 Apr 2015 14:25:46 +0000 (+0600)
Subject: Merge branch 'varzesh3' of https://github.com/mtp1376/youtube-dl into mtp1376-varzesh3
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=69c3af567d852a0be7bb39b1ca7348e0d5712ec3;hp=-c

Merge branch 'varzesh3' of https://github.com/mtp1376/youtube-dl into mtp1376-varzesh3
---

69c3af567d852a0be7bb39b1ca7348e0d5712ec3
diff --combined youtube_dl/extractor/__init__.py
index 9fddb8e32,3011b784d..f3ebe4ee2
--- 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
@@@ -311,8 -309,6 +311,8 @@@ from .nba import NBAI
  from .nbc import (
      NBCIE,
      NBCNewsIE,
 +    NBCSportsIE,
 +    NBCSportsVPlayerIE,
  )
  from .ndr import NDRIE
  from .ndtv import NDTVIE
@@@ -424,10 -420,6 +424,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
@@@ -556,10 -548,10 +556,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