From: chrysn <chrysn@fsfe.org>
Date: Thu, 19 Nov 2015 19:05:13 +0000 (+0100)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=135835e6e789344202fe2329829c8534ca41ae59;hp=--cc;p=debienna.git

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

135835e6e789344202fe2329829c8534ca41ae59