Merge branch 'ping-qqmusic-more-formats'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 5 Jun 2015 15:19:54 +0000 (23:19 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 5 Jun 2015 15:19:54 +0000 (23:19 +0800)

Trivial merge