Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
[ikiwiki] / underlays / basewiki / ikiwiki /
2007-12-08  Joey HessMAJOR basewiki reorg