From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 11 Dec 2014 16:11:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'fstirlitz/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=69f491f14e132a54e8ca7de291183dced64d461d;p=youtube-dl

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

69f491f14e132a54e8ca7de291183dced64d461d