Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki] / doc / soc / discussion.mdwn

SOC application period is open from now until the 15th so if this is gonna
be done we'd better get on with it --[[Joey]]