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

Simple merge