Merge branch 'master' into prefix-directives
[ikiwiki] / ikiwiki-update-wikilist
2007-09-06  joey commit.