From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 30 Jan 2016 08:25:55 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8bf39420b4712c33aff45abba4a910e7e58cba5a;p=youtube-dl

Merge remote-tracking branch 'upstream/master'
---

8bf39420b4712c33aff45abba4a910e7e58cba5a