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

Merge remote-tracking branch 'michael-k/links'
---

b703ab4d7f39ea7e9a88c971d55fdcc1b468ba26