From: Jakob Haufe <sur5r@sur5r.net>
Date: Sun, 7 Jun 2015 01:10:02 +0000 (+0200)
Subject: Merge tag 'upstream/2.4'
X-Git-Tag: debian/2.9-1~17
X-Git-Url: https://git.sur5r.net/?p=minitube;a=commitdiff_plain;h=fd2de342562fc7565ee7437636eb10c4456e0368

Merge tag 'upstream/2.4'

Upstream version 2.4
---

fd2de342562fc7565ee7437636eb10c4456e0368