From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 22 Mar 2015 01:44:28 +0000 (+0600)
Subject: Merge branch 'the-daily-show-podcast' of https://github.com/fstirlitz/youtube-dl... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=ef249a2cd7a7cfbd92a030cb72e238ba4ad52604;hp=-c

Merge branch 'the-daily-show-podcast' of https://github.com/fstirlitz/youtube-dl into fstirlitz-the-daily-show-podcast
---

ef249a2cd7a7cfbd92a030cb72e238ba4ad52604
diff --combined youtube_dl/extractor/__init__.py
index e25e4a582,e94779d40..a20492fc3
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -84,7 -84,7 +84,7 @@@ from .cnn import 
  )
  from .collegehumor import CollegeHumorIE
  from .collegerama import CollegeRamaIE
- from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
+ from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE, TheDailyShowPodcastIE
  from .comcarcoff import ComCarCoffIE
  from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
  from .condenast import CondeNastIE
@@@ -107,7 -107,6 +107,7 @@@ from .dctp import DctpTvI
  from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
  from .dotsub import DotsubIE
 +from .douyutv import DouyuTVIE
  from .dreisat import DreiSatIE
  from .drbonanza import DRBonanzaIE
  from .drtuber import DrTuberIE
@@@ -251,6 -250,7 +251,7 @@@ from .letv import 
      LetvPlaylistIE
  )
  from .lifenews import LifeNewsIE
+ from .libsyn import LibsynIE
  from .liveleak import LiveLeakIE
  from .livestream import (
      LivestreamIE,
@@@ -346,7 -346,6 +347,7 @@@ from .npo import 
  )
  from .nrk import (
      NRKIE,
 +    NRKPlaylistIE,
      NRKTVIE,
  )
  from .ntvde import NTVDeIE
@@@ -382,7 -381,6 +383,7 @@@ from .pornhub import 
  )
  from .pornotube import PornotubeIE
  from .pornoxo import PornoXOIE
 +from .primesharetv import PrimeShareTVIE
  from .promptfile import PromptFileIE
  from .prosiebensat1 import ProSiebenSat1IE
  from .puls4 import Puls4IE
@@@ -539,7 -537,6 +540,7 @@@ from .udemy import 
      UdemyIE,
      UdemyCourseIE
  )
 +from .ultimedia import UltimediaIE
  from .unistra import UnistraIE
  from .urort import UrortIE
  from .ustream import UstreamIE, UstreamChannelIE