From: Jakob Haufe <sur5r@sur5r.net>
Date: Fri, 5 Sep 2014 21:01:36 +0000 (+0200)
Subject: Merge tag 'upstream/2.2'
X-Git-Tag: debian/2.2-1~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8f1c0e9e0547b478101879342ef240c7e4fae8d1;p=minitube

Merge tag 'upstream/2.2'

Upstream version 2.2
---

8f1c0e9e0547b478101879342ef240c7e4fae8d1