From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 16 Sep 2014 21:35:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d0246d07f1e2f0c81bde051ac10db287b3e5e44b;p=youtube-dl

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

d0246d07f1e2f0c81bde051ac10db287b3e5e44b