From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 28 Oct 2013 09:44:13 +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=ebc14f251c2968f4cb6cb18610b857ecb24348c8

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

ebc14f251c2968f4cb6cb18610b857ecb24348c8