Merge remote branch 'remotes/peteg/revert' into revert
[ikiwiki] / doc / GPL
2006-03-24  joeymove