web commit by joey: conflict and merge is done!
[ikiwiki] / IkiWiki /
2006-03-15  joeyfixes
2006-03-15  joeyconfig files now based on perl modules