From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 19 Nov 2016 16:07:35 +0000 (+0800)
Subject: Merge branch 'DarkstaIkers-master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2176e466e0261209e52a771e66d098ef8ed41e10;p=youtube-dl

Merge branch 'DarkstaIkers-master'
---

2176e466e0261209e52a771e66d098ef8ed41e10