From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 3 Jan 2014 11:20:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'diffycat/jpopsuki'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=d2fee313ec71ad8a4d8b57ec9f433210ee01056b

Merge remote-tracking branch 'diffycat/jpopsuki'
---

d2fee313ec71ad8a4d8b57ec9f433210ee01056b