From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 12 Nov 2014 14:34:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'xantares/goldenmoustache'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=0b201a3134e9b343e2791f2686f1a34f737007a4

Merge remote-tracking branch 'xantares/goldenmoustache'
---

0b201a3134e9b343e2791f2686f1a34f737007a4