From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 15 Sep 2014 14:10:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'naglis/nosvideo'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=acd9db590293bd914a0ec02e76cae546fd6e473f;p=youtube-dl

Merge remote-tracking branch 'naglis/nosvideo'
---

acd9db590293bd914a0ec02e76cae546fd6e473f