From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 12 Dec 2014 10:35:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'grompe/patch-1'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f8780e6d11489a3ddff5019ad06fca1b0bed6e9a;p=youtube-dl

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

f8780e6d11489a3ddff5019ad06fca1b0bed6e9a