From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 24 Oct 2014 13:02:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'capital-G/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8d81f872fb9844ac640c84b8937d3a53b729d1aa;p=youtube-dl

Merge remote-tracking branch 'capital-G/master'
---

8d81f872fb9844ac640c84b8937d3a53b729d1aa