From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 7 Sep 2016 16:31:06 +0000 (+0800)
Subject: Merge branch 'xyb-miaopai'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=9c2718898891678038dffcb683c3948722c6b47d;p=youtube-dl

Merge branch 'xyb-miaopai'
---

9c2718898891678038dffcb683c3948722c6b47d