From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 21 Aug 2016 18:11:43 +0000 (+0800)
Subject: Merge branch 'TRox1972-charlierose'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=f97f9f71e53cfc4d355be6e989632f2bd67b350d

Merge branch 'TRox1972-charlierose'
---

f97f9f71e53cfc4d355be6e989632f2bd67b350d