From: chrysn <chrysn@fsfe.org>
Date: Wed, 3 Feb 2016 08:45:42 +0000 (+0100)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;ds=sidebyside;h=3661038189b5e31b425a973f9e1e97893b822d58;hp=3661038189b5e31b425a973f9e1e97893b822d58;p=debienna.git

Merge branch 'master' of git.deb.at:debienna
---