From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Apr 2015 10:10:17 +0000 (+0600)
Subject: Merge branch 'radiojavan' of https://github.com/mtp1376/youtube-dl into mtp1376-radio... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cce23e43a94bb73b7ed4815c2f517a682457d1c4;hp=-c;p=youtube-dl

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

cce23e43a94bb73b7ed4815c2f517a682457d1c4
diff --combined youtube_dl/extractor/__init__.py
index aae4aae4c,df4a7419a..d7e8138be
--- 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
@@@ -276,7 -274,6 +276,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
@@@ -312,8 -309,6 +312,8 @@@ from .nba import NBAI
  from .nbc import (
      NBCIE,
      NBCNewsIE,
 +    NBCSportsIE,
 +    NBCSportsVPlayerIE,
  )
  from .ndr import NDRIE
  from .ndtv import NDTVIE
@@@ -396,6 -391,7 +396,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
@@@ -425,10 -421,6 +426,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
@@@ -561,7 -553,6 +562,7 @@@ from .varzesh3 import Varzesh3I
  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