From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 28 Jan 2014 02:29:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'dstftw/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c1e60cc2bf4d0130dac154e9014913e7d63d25ff;p=youtube-dl

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

c1e60cc2bf4d0130dac154e9014913e7d63d25ff