From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 23 Nov 2014 20:55:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'daohoangson/zing-mp3'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c1777d5cb3fb1ae48de79badfe5b8db9963999b4

Merge remote-tracking branch 'daohoangson/zing-mp3'
---

c1777d5cb3fb1ae48de79badfe5b8db9963999b4