From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 14 Oct 2013 23:25:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=850555c4843f7815030d015ec7df798332e60582;p=youtube-dl

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

850555c4843f7815030d015ec7df798332e60582