Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs