Merge branch 'fktv' of https://github.com/remitamine/youtube-dl into remitamine-fktv
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 25 Sep 2015 09:02:10 +0000 (17:02 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 25 Sep 2015 09:02:10 +0000 (17:02 +0800)
1  2 
youtube_dl/extractor/__init__.py

Simple merge