From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 9 Sep 2016 17:42:36 +0000 (+0700)
Subject: Merge branch 'polskie-radio-programme' of https://github.com/JakubAdamWieczorek/youtu... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=1e19ff2984f4887bbe79d9306841c3e2a96b2f37;hp=-c

Merge branch 'polskie-radio-programme' of https://github.com/JakubAdamWieczorek/youtube-dl
---

1e19ff2984f4887bbe79d9306841c3e2a96b2f37
diff --combined youtube_dl/extractor/extractors.py
index 38dc33674,f8f91f13d..6a142996f
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -146,7 -146,6 +146,7 @@@ from .cbsnews import 
  )
  from .cbssports import CBSSportsIE
  from .ccc import CCCIE
 +from .cctv import CCTVIE
  from .cda import CDAIE
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
@@@ -407,7 -406,6 +407,7 @@@ from .kankan import KankanI
  from .karaoketv import KaraoketvIE
  from .karrierevideos import KarriereVideosIE
  from .keezmovies import KeezMoviesIE
 +from .ketnet import KetnetIE
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
@@@ -426,7 -424,6 +426,7 @@@ from .kuwo import 
  )
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
 +from .lci import LCIIE
  from .lcp import (
      LcpPlayIE,
      LcpIE,
@@@ -477,7 -474,6 +477,7 @@@ from .metacafe import MetacafeI
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
  from .mgtv import MGTVIE
 +from .miaopai import MiaoPaiIE
  from .microsoftvirtualacademy import (
      MicrosoftVirtualAcademyIE,
      MicrosoftVirtualAcademyCourseIE,
@@@ -671,7 -667,7 +671,7 @@@ from .pluralsight import 
  )
  from .podomatic import PodomaticIE
  from .pokemon import PokemonIE
- from .polskieradio import PolskieRadioIE
+ from .polskieradio import PolskieRadioIE, PolskieRadioProgrammeIE
  from .porn91 import Porn91IE
  from .porncom import PornComIE
  from .pornhd import PornHdIE
@@@ -725,7 -721,6 +725,7 @@@ from .revision3 import 
  )
  from .rice import RICEIE
  from .ringtv import RingTVIE
 +from .rmcdecouverte import RMCDecouverteIE
  from .ro220 import Ro220IE
  from .rockstargames import RockstarGamesIE
  from .roosterteeth import RoosterTeethIE
@@@ -862,7 -857,6 +862,7 @@@ from .telebruxelles import TeleBruxelle
  from .telecinco import TelecincoIE
  from .telegraaf import TelegraafIE
  from .telemb import TeleMBIE
 +from .telequebec import TeleQuebecIE
  from .teletask import TeleTaskIE
  from .telewebion import TelewebionIE
  from .testurl import TestURLIE