From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 May 2014 08:05:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'hojel/nuvid'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=b65c3e77e8fa893a41eb058102422f42276ebc11

Merge remote-tracking branch 'hojel/nuvid'
---

b65c3e77e8fa893a41eb058102422f42276ebc11