]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge branch 'Weiqitv' of https://github.com/FounderSG/youtube-dl into FounderSG...
authorYen Chi Hsuan <yan12125@gmail.com>
Tue, 19 Jan 2016 15:39:32 +0000 (23:39 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Tue, 19 Jan 2016 15:39:32 +0000 (23:39 +0800)
1  2 
youtube_dl/extractor/__init__.py

Simple merge