Merge branch 'master' into templatemove
[ikiwiki] / doc / GPL
2006-03-24  joeymove