From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 12 Sep 2015 14:45:32 +0000 (+0800)
Subject: Merge branch 'linhua55-master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d434ca5448b62568e6c56c2e9ea83d10c9da196d;p=youtube-dl

Merge branch 'linhua55-master'
---

d434ca5448b62568e6c56c2e9ea83d10c9da196d