Merge branch 'yinyuetai' of https://github.com/ping/youtube-dl into ping-yinyuetai
authorYen Chi Hsuan <yan12125@gmail.com>
Wed, 8 Jul 2015 16:48:23 +0000 (00:48 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Wed, 8 Jul 2015 16:48:23 +0000 (00:48 +0800)
1  2 
youtube_dl/extractor/__init__.py

index f7c1f07a4618739eedcdb52d03ba7d6beef24d18,8665855eb37a17f1a24fd3affb518d8b2a5e5120..a0e3b333d595e5d73a09f91240a7413c7dabae03
@@@ -432,7 -432,6 +432,7 @@@ from .qqmusic import 
      QQMusicSingerIE,
      QQMusicAlbumIE,
      QQMusicToplistIE,
 +    QQMusicPlaylistIE,
  )
  from .quickvid import QuickVidIE
  from .r7 import R7IE
@@@ -734,6 -733,7 +734,7 @@@ from .yandexmusic import 
      YandexMusicPlaylistIE,
  )
  from .yesjapan import YesJapanIE
+ from .yinyuetai import YinYueTaiIE
  from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE