conflict detection, merging, etc should be done now, I think
[ikiwiki] / IkiWiki /
2006-03-15  joeyfixes
2006-03-15  joeyconfig files now based on perl modules