From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 15 Oct 2016 06:56:00 +0000 (+0800)
Subject: Merge branch 'pyx-huajiao'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4102e64051e6949f2618f9a621641506c13a6163;hp=f605242bfcfe53403019f8bfcb3e10466992df7c;p=youtube-dl

Merge branch 'pyx-huajiao'
---