From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Tue, 3 Nov 2015 16:54:27 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=236cb2131b1dc45c9b7ffc534f0a9abfe2fff76c;p=youtube-dl

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

236cb2131b1dc45c9b7ffc534f0a9abfe2fff76c