From: chrysn <chrysn@fsfe.org>
Date: Thu, 28 Apr 2016 13:42:01 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=21c8a542b15b2af4e23cb2cddd4e62417ab2065f;hp=21c8a542b15b2af4e23cb2cddd4e62417ab2065f;p=debienna.git

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