From: chrysn <chrysn@fsfe.org>
Date: Tue, 26 Apr 2016 05:44:57 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=074b314d5a27f24217bd1e9bc4dbb5f65a01ef2a;hp=074b314d5a27f24217bd1e9bc4dbb5f65a01ef2a;p=debienna.git

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