From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 11 Nov 2015 16:08:42 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=a4c2ab35c1c1cc7385b21b15e5c082313236048c

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

a4c2ab35c1c1cc7385b21b15e5c082313236048c