Merge branch 'master' of ssh://git.ikiwiki.info
[ikiwiki] / doc / users / Simon_Michael.mdwn
2008-06-28  Joey Hessweb commit by simon