From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 14 Oct 2013 14:07:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7394b8db3b8b43886ad46822bfc7631fb82d542b;hp=-c;p=youtube-dl

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

7394b8db3b8b43886ad46822bfc7631fb82d542b