Merge commit 'upstream/master' into pub/po
[ikiwiki] / IkiWiki / Setup /
2006-03-15  joeyconfig files now based on perl modules