From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 1 Feb 2013 17:05:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'dcoppa/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c7a725cfad52dd82ed4695eb526c053c7d48944d

Merge remote-tracking branch 'dcoppa/master'
---

c7a725cfad52dd82ed4695eb526c053c7d48944d