From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Mon, 1 Feb 2016 09:29:12 +0000 (+0800)
Subject: Merge branch 'daum-playlist-user' of https://github.com/ping/youtube-dl into ping... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=33cc74eeebe9355f38145d0d6ddc84e5a2dc1af8;hp=-c;p=youtube-dl

Merge branch 'daum-playlist-user' of https://github.com/ping/youtube-dl into ping-daum-playlist-user
---

33cc74eeebe9355f38145d0d6ddc84e5a2dc1af8
diff --combined youtube_dl/extractor/__init__.py
index dbdfb86c0,e05d986ef..e61a88de7
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -142,6 -142,8 +142,8 @@@ from .dailymotion import 
  from .daum import (
      DaumIE,
      DaumClipIE,
+     DaumPlaylistIE,
+     DaumUserIE,
  )
  from .dbtv import DBTVIE
  from .dcn import (
@@@ -372,7 -374,6 +374,7 @@@ from .macgamestore import MacGameStoreI
  from .mailru import MailRuIE
  from .makertv import MakerTVIE
  from .malemotion import MalemotionIE
 +from .matchtv import MatchTVIE
  from .mdr import MDRIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
@@@ -483,7 -484,6 +485,7 @@@ from .npo import 
      NPOLiveIE,
      NPORadioIE,
      NPORadioFragmentIE,
 +    SchoolTVIE,
      VPROIE,
      WNLIE
  )