From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 30 Apr 2015 15:33:49 +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=ffbc3901d276a4fafc9423c51dc2c6aa5d108d91

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

ffbc3901d276a4fafc9423c51dc2c6aa5d108d91