From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 22 Oct 2016 05:10:27 +0000 (+0800)
Subject: Merge branch 'johnhawkinson-stdin2'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e034cbc581c79b14c6337adf51bf4a99f726302d;p=youtube-dl

Merge branch 'johnhawkinson-stdin2'
---

e034cbc581c79b14c6337adf51bf4a99f726302d