Merge branch 'TRox1972-charlierose'

diff --combined youtube_dl/extractor/extractors.py
index 20fb23527a860b5c5121c5142d003531ddb669c0,d4d90c1f8d8dfa72894f74dd3a448716d48d592b..b0644be11f23b57f5af1a10315ea89d51992ea7c
--- 1/youtube_dl/extractor/extractors.py
--- 2/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