From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 24 Mar 2014 00:42:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=ce328530a9009ffb5f0f486fc5178520d972f07a

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

ce328530a9009ffb5f0f486fc5178520d972f07a