Merge branch 'master' of ssh://me@pekdon.net@projects.pekdon.net/srv/git/pekwm