Merge branch 'master' of git://github.com/joeyh/ikiwiki
[ikiwiki] / doc / GPL
2006-03-24  joeymove