From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 31 Oct 2015 14:06:05 +0000 (+0800)
Subject: Merge branch 'pr-democracynow' of https://github.com/atomicdryad/youtube-dl into... 
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=33a513faf716e5d4a170da50d6fde541817dca09;p=youtube-dl

Merge branch 'pr-democracynow' of https://github.com/atomicdryad/youtube-dl into atomicdryad-pr-democracynow
---

33a513faf716e5d4a170da50d6fde541817dca09
diff --cc youtube_dl/extractor/__init__.py
index f98e6487e,5cc03b875..10286aa88
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -121,9 -110,9 +121,10 @@@ from .dailymotion import 
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
 +from .dcn import DCNIE
  from .dctp import DctpTvIE
  from .deezer import DeezerPlaylistIE
+ from .democracynow import DemocracynowIE
  from .dfb import DFBIE
  from .dhm import DHMIE
  from .dotsub import DotsubIE