From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 22 Feb 2014 13:38:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'JohnyMoSwag/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=af284c6d1b2833e1d3d3619306efca764e3e59af;p=youtube-dl

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

af284c6d1b2833e1d3d3619306efca764e3e59af