Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info