Merge remote branch 'upstream/master' into prv/po
[ikiwiki] / doc / examples / softwaresite / news /
2006-11-22  joey* Add softwaresite example.