Merge remote branch 'remotes/origin/master'
[ikiwiki] / doc / GPL
2006-03-24  joeymove