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