From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 01:03:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'xavierbeynon/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=51897bb77c504ad206abbef5ae7504fcd082b5b0

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

51897bb77c504ad206abbef5ae7504fcd082b5b0