Merge branch 'master' of ssh://ubergit.debian.org/dsa/wiki