Merge branch 'master' into templatemove
[ikiwiki] / doc / consultants.mdwn
2008-06-12  Joey Hessadd consultant list, add news item