Merge remote-tracking branch 'schmonz/cvs'
[ikiwiki] / doc / GPL
2006-03-24  joeymove