Merge branch 'ping-neteasemusic'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 10 Jul 2015 10:59:58 +0000 (18:59 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 10 Jul 2015 10:59:58 +0000 (18:59 +0800)

Trivial merge