Merge branch 'master' of ssh://git.ikiwiki.info
[ikiwiki] / doc / GPL
2006-03-24  joeymove