From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 5 Sep 2015 07:24:09 +0000 (+0800)
Subject: Merge branch 'vlive' of https://github.com/ping/youtube-dl into ping-vlive
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=027eb5a6b041a91ca7fdd61826daaea24bec1cfb;hp=-c;p=youtube-dl.git

Merge branch 'vlive' of https://github.com/ping/youtube-dl into ping-vlive
---

027eb5a6b041a91ca7fdd61826daaea24bec1cfb
diff --combined youtube_dl/extractor/__init__.py
index 39b05ce8f,6bee5b63c..5d2ea39d0
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -241,10 -241,7 +241,10 @@@ from .imdb import 
      ImdbIE,
      ImdbListIE
  )
 -from .imgur import ImgurIE
 +from .imgur import (
 +    ImgurIE,
 +    ImgurAlbumIE,
 +)
  from .ina import InaIE
  from .indavideo import (
      IndavideoIE,
@@@ -343,7 -340,6 +343,7 @@@ from .mtv import 
      MTVIE,
      MTVServicesEmbeddedIE,
      MTVIggyIE,
 +    MTVDEIE,
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
@@@ -458,10 -454,6 +458,10 @@@ from .playfm import PlayFMI
  from .playtvak import PlaytvakIE
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
 +from .pluralsight import (
 +    PluralsightIE,
 +    PluralsightCourseIE,
 +)
  from .podomatic import PodomaticIE
  from .porn91 import Porn91IE
  from .pornhd import PornHdIE
@@@ -743,6 -735,7 +743,7 @@@ from .vk import 
      VKIE,
      VKUserVideosIE,
  )
+ from .vlive import VLiveIE
  from .vodlocker import VodlockerIE
  from .voicerepublic import VoiceRepublicIE
  from .vporn import VpornIE