From: sprhawk <465558+sprhawk@users.noreply.github.com>
Date: Tue, 26 Dec 2017 14:27:26 +0000 (+0800)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl into weibo
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c33de004e13da11f1ae3cad7310b36500cfb9d28

Merge branch 'master' of github.com:rg3/youtube-dl into weibo
---

c33de004e13da11f1ae3cad7310b36500cfb9d28