From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 19 Aug 2015 17:56:08 +0000 (+0800)
Subject: Merge branch 'master' into HEAD
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=51047444aa6516b0062a3320625f67e3d4fe51d2;p=youtube-dl

Merge branch 'master' into HEAD
---

51047444aa6516b0062a3320625f67e3d4fe51d2