Hi, everybody. I hope my small CMS+Wiki combination will be useful for someone: CmsWiki (http://aplikacja.info/cmswiki/view.php). Some
features:
Fassssst (600 req/sec) - measured on small 400 Mhz VPS
Easy to use (WYSIWYG, no special Wiki syntax to learn, one click to edit)
Highly customisable (integration with any template is very simple)
Secure: relies on standard HTTP server security mechanism: .htaccess for instance
Open Source: want new feature? Browse the source and hack (patches are welcome :))
Automatic conflicting changes merge (like those in CVS/SVN/Git/Bazaar/...)