Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[ikiwiki] / underlays / basewiki / ikiwiki.mdwn
2007-12-08  Joey Hessupdates