Merge branch 'miaopai' of https://github.com/xyb/youtube-dl into xyb-miaopai
authorYen Chi Hsuan <yan12125@gmail.com>
Wed, 7 Sep 2016 16:08:02 +0000 (00:08 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Wed, 7 Sep 2016 16:08:02 +0000 (00:08 +0800)
1  2 
youtube_dl/extractor/extractors.py

Simple merge