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

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

948bcc60df48415ddbf3d7ea03bc3af53a9d928d