Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Thu, 21 Apr 2016 21:02:45 +0000 (23:02 +0200)
committerchrysn <chrysn@fsfe.org>
Thu, 21 Apr 2016 21:02:45 +0000 (23:02 +0200)

Trivial merge