From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 20 Nov 2013 05:28:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'diffycat/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=71791f414ca93d819b8585882ec1eeb006dbb63b;p=youtube-dl

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

71791f414ca93d819b8585882ec1eeb006dbb63b