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)
commit2a01c940ec956b26c5dc18c355b66f719fc46386
tree82c8abc112ca8ffee58545ce01c48fb1df795d73
parentbf20b9c5405b276e6de29b1b28b2e3ad2182e891
parent4eab60cbd27ea8ce31ae9c6bf6b3f6e0e469d3af
Merge branch 'ping-neteasemusic'