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