From: Yen Chi Hsuan Date: Sat, 15 Oct 2016 06:53:05 +0000 (+0800) Subject: Merge branch 'huajiao' of https://github.com/pyx/youtube-dl into pyx-huajiao X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=a347a0d08875c27287f876c2016b8c45dac051ac Merge branch 'huajiao' of https://github.com/pyx/youtube-dl into pyx-huajiao --- a347a0d08875c27287f876c2016b8c45dac051ac