Merge branch 'master' of ssh://git.ikiwiki.info
[ikiwiki] / doc / users / peter_woodman.mdwn
1 hello. i live [here](http://shortbus.org/).