From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Fri, 26 Aug 2016 17:17:12 +0000 (+0800)
Subject: Merge branch 'steven7851-patch-2'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=d181cff685aa889864a0356fa546e2d5605f27d2;p=youtube-dl

Merge branch 'steven7851-patch-2'
---

d181cff685aa889864a0356fa546e2d5605f27d2