From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 30 Jan 2015 09:56:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'codesparkle/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7b6c60393eda2c97270f2762fc465401af91b087;p=youtube-dl

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

7b6c60393eda2c97270f2762fc465401af91b087