Merge branch 'master', remote-tracking branch 'joey/master'
[ikiwiki.git] / doc / GPL
2006-03-24 joeymove