From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 25 Nov 2014 08:22:33 +0000 (+0100)
Subject: Merge remote-tracking branch 't0mm0/x-minus'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0bbf12239c5a97ddcaa9d54012cbcb2448223072;p=youtube-dl

Merge remote-tracking branch 't0mm0/x-minus'
---

0bbf12239c5a97ddcaa9d54012cbcb2448223072