Merge remote branch 'upstream/master' into prv/po

[ikiwiki] / doc / users / dirk.mdwn

Dirk is a computer consultant living in West Sussex that does a fair amount of perl and a lot of C.