Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Sun, 24 Apr 2016 08:08:12 +0000 (10:08 +0200)
committerchrysn <chrysn@fsfe.org>
Sun, 24 Apr 2016 08:08:12 +0000 (10:08 +0200)

Trivial merge