From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 23 Nov 2014 20:55:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'daohoangson/zing-mp3'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c1777d5cb3fb1ae48de79badfe5b8db9963999b4;hp=-c;p=youtube-dl

Merge remote-tracking branch 'daohoangson/zing-mp3'
---

c1777d5cb3fb1ae48de79badfe5b8db9963999b4
diff --combined youtube_dl/extractor/__init__.py
index 43185345e,3a520908b..fb5e6ac77
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -511,6 -511,10 +511,10 @@@ from .youtube import 
      YoutubeWatchLaterIE,
  )
  from .zdf import ZDFIE
+ from .zingmp3 import (
+     ZingMp3SongIE,
+     ZingMp3AlbumIE,
+ )
  
  _ALL_CLASSES = [
      klass
@@@ -529,4 -533,4 +533,4 @@@ def gen_extractors()
  
  def get_info_extractor(ie_name):
      """Returns the info extractor class with the given ie_name"""
 -    return globals()[ie_name+'IE']
 +    return globals()[ie_name + 'IE']