From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 5 Jan 2015 17:07:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'ckrooss/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=93e40a7b2f0020a3d1e9f5e5afe29f308dcb6b73

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

93e40a7b2f0020a3d1e9f5e5afe29f308dcb6b73