Merge commit 'upstream/master' into prv/po
[ikiwiki.git] / CHANGELOG
2006-09-09  joey* Work on firming up the plugin interface: