From: Jakob Haufe <sur5r@sur5r.net>
Date: Thu, 12 Jun 2014 19:15:58 +0000 (+0200)
Subject: Merge tag 'upstream/2.1.5'
X-Git-Tag: debian/2.1.6-1~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e80042f928db0f4d301262c2585f2020b8c69006;p=minitube

Merge tag 'upstream/2.1.5'

Upstream version 2.1.5
---

e80042f928db0f4d301262c2585f2020b8c69006