Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[ikiwiki] / doc / soc / discussion.mdwn
2007-03-06  joeyapplication period open..