From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 20 Nov 2013 05:21:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'dz0ny/patch-1'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=86bd5f2ca9e17bb7f619595e02b28ca4954aeee8

Merge remote-tracking branch 'dz0ny/patch-1'
---

86bd5f2ca9e17bb7f619595e02b28ca4954aeee8