Merge branch 'master' of git+ssh://zobel@db.debian.org/git/dsa-wiki