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

Trivial merge