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