Merge branch 'master' into templatemove
[ikiwiki] / doc / competition.mdwn
2009-11-17  Joey Hessadd page listing some alternatives to ikiwiki