From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Fri, 10 Jul 2015 10:59:58 +0000 (+0800)
Subject: Merge branch 'ping-neteasemusic'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2a01c940ec956b26c5dc18c355b66f719fc46386;p=youtube-dl

Merge branch 'ping-neteasemusic'
---

2a01c940ec956b26c5dc18c355b66f719fc46386