From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Tue, 19 Jan 2016 20:06:09 +0000 (+0800)
Subject: Merge branch 'FounderSG-Weiqitv'
X-Git-Tag: 2016.01.23~34
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d8024aebe5b77b160006e7f3cfc144e8b9045a6b;p=youtube-dl.git

Merge branch 'FounderSG-Weiqitv'
---

d8024aebe5b77b160006e7f3cfc144e8b9045a6b