From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Sep 2014 08:10:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'd912e3/golem'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=92f7963f6e5dd9d6f2c8805f8ca51c70df15a776

Merge remote-tracking branch 'd912e3/golem'
---

92f7963f6e5dd9d6f2c8805f8ca51c70df15a776