Merge branch 'ping-qqmusic-format-fix'
authorYen Chi Hsuan <yan12125@gmail.com>
Mon, 6 Jul 2015 09:55:45 +0000 (17:55 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Mon, 6 Jul 2015 09:55:45 +0000 (17:55 +0800)

Trivial merge