From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 2 Oct 2013 06:23:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'holomorph/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=4f8bf17f23e2366205d8670fc9af2568063f7e89

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

4f8bf17f23e2366205d8670fc9af2568063f7e89