From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 12 Sep 2015 19:04:44 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f665ef8fc5887d2a93560fc992c1d2ba6b72978e;p=youtube-dl

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

f665ef8fc5887d2a93560fc992c1d2ba6b72978e