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

master
Jon Dowland 2009-04-01 23:13:32 +01:00
commit 7680af864e
1 changed files with 2 additions and 2 deletions

View File

@ -4,8 +4,8 @@ team-documentation management system for a small-sized group of UNIX
sysadmins. sysadmins.
* my edits should appear either as 'Jon' (if I've used * my edits should appear either as 'Jon' (if I've used
[[tips/untrusted_git_push]]) or 'jmtd.net (or once upon a time [[tips/untrusted_git_push]]) or 'jmtd.net' (or once upon a time
'alcopop.org/me/openid/'). 'alcopop.org/me/openid/' or 'jondowland').
* My [homepage](http://jmtd.net/) is powered by ikiwiki * My [homepage](http://jmtd.net/) is powered by ikiwiki
I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual