From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 21 Aug 2016 18:11:43 +0000 (+0800)
Subject: Merge branch 'TRox1972-charlierose'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f97f9f71e53cfc4d355be6e989632f2bd67b350d;hp=-c;p=youtube-dl

Merge branch 'TRox1972-charlierose'
---

f97f9f71e53cfc4d355be6e989632f2bd67b350d
diff --combined youtube_dl/extractor/extractors.py
index 20fb23527,d4d90c1f8..b0644be11
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -134,6 -134,7 +134,7 @@@ from .ccc import CCCI
  from .cda import CDAIE
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
+ from .charlierose import CharlieRoseIE
  from .chaturbate import ChaturbateIE
  from .chilloutzone import ChilloutzoneIE
  from .chirbit import (
@@@ -1114,4 -1115,7 +1115,4 @@@ from .youtube import 
  )
  from .zapiks import ZapiksIE
  from .zdf import ZDFIE, ZDFChannelIE
 -from .zingmp3 import (
 -    ZingMp3SongIE,
 -    ZingMp3AlbumIE,
 -)
 +from .zingmp3 import ZingMp3IE