Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Mon, 25 Apr 2016 15:57:51 +0000 (17:57 +0200)
committerchrysn <chrysn@fsfe.org>
Mon, 25 Apr 2016 15:57:51 +0000 (17:57 +0200)

Trivial merge