Merge branch 'qqmusic-playlist' of https://github.com/ping/youtube-dl into ping-qqmus...
authorYen Chi Hsuan <yan12125@gmail.com>
Mon, 6 Jul 2015 08:08:30 +0000 (16:08 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Mon, 6 Jul 2015 08:08:30 +0000 (16:08 +0800)
1  2 
youtube_dl/extractor/__init__.py

Simple merge