From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Tue, 19 Jan 2016 20:22:25 +0000 (+0800)
Subject: Merge branch 'ping-patch-8239'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7d4d9c526a3bbf483da33e886d17134244421537;p=youtube-dl

Merge branch 'ping-patch-8239'
---

7d4d9c526a3bbf483da33e886d17134244421537