From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Fri, 5 Jun 2015 15:19:54 +0000 (+0800)
Subject: Merge branch 'ping-qqmusic-more-formats'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=63ccf6474ddbde80b390d92bf542881f90d8ea23;p=youtube-dl.git

Merge branch 'ping-qqmusic-more-formats'
---

63ccf6474ddbde80b390d92bf542881f90d8ea23