Merge branch 'master' into cvs
Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
Disabling certain formats for comments
cleanup
Revert "Vandalism by Noah"

This reverts commit 5848daea86d9f5d420b313c234c57c12c62da557.
Merge branch 'master' of ssh://git.ikiwiki.info
highlight: Now adds a span with class highlight-<extension> around highlighted content, allowing for language-specific css styling.
releasing version 3.20130212
add news item for ikiwiki 3.20130212
Update Svend's personal webpage hostname/URLs
Merge branch 'master' into cvs