From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 29 Oct 2013 05:48:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f7ff55aa7876ba8a58bbee002d254aa6ab49302b;hp=-c;p=youtube-dl

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

f7ff55aa7876ba8a58bbee002d254aa6ab49302b