From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 17 Feb 2014 10:26:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'Nikerabbit/hki'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4412ca751d68185ed60b0164b91687073215f01e;p=youtube-dl

Merge remote-tracking branch 'Nikerabbit/hki'
---

4412ca751d68185ed60b0164b91687073215f01e