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)

Trivial merge