Merge branch 'ping-qqmusic-playlist'
authorYen Chi Hsuan <yan12125@gmail.com>
Mon, 6 Jul 2015 08:20:46 +0000 (16:20 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Mon, 6 Jul 2015 08:20:46 +0000 (16:20 +0800)

Trivial merge