Merge branch 'file_pruned_revamp'
[ikiwiki] / doc / GPL
2006-03-24  joeymove