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