Merge branch 'huajiao' of https://github.com/pyx/youtube-dl into pyx-huajiao
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 15 Oct 2016 06:53:05 +0000 (14:53 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 15 Oct 2016 06:53:05 +0000 (14:53 +0800)
commita347a0d08875c27287f876c2016b8c45dac051ac
treec5a9760d1375a4fbcd6f7b873b78b5ac1af8c43a
parent77c5b98dcd737accf6b40321db5a2494a4702af4
parent2e638d7bcae26ef3f8a9d707d49c897e19571a0e
Merge branch 'huajiao' of https://github.com/pyx/youtube-dl into pyx-huajiao