]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge branch 'kuwo' of https://github.com/ping/youtube-dl into ping-kuwo
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 10 Jul 2015 11:11:58 +0000 (19:11 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 10 Jul 2015 11:11:58 +0000 (19:11 +0800)
1  2 
youtube_dl/extractor/__init__.py

Simple merge