Merge branch 'master' into templatemove
[ikiwiki] / doc / users / dirk.mdwn
2008-04-22  Joey Hessweb commit by Dirk