Merge branch 'kusi' of https://github.com/mutantmonkey/youtube-dl into mutantmonkey...
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 4 Mar 2016 06:21:23 +0000 (14:21 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 4 Mar 2016 06:21:23 +0000 (14:21 +0800)
1  2 
youtube_dl/extractor/__init__.py

Simple merge