From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 14 May 2015 09:07:02 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=88f9d8748c19d1ee6a06e95eb5ed4dc31052e9ad;p=youtube-dl

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

88f9d8748c19d1ee6a06e95eb5ed4dc31052e9ad