Merge remote branch 'upstream/master' into prv/po

[ikiwiki] / doc / logo / discussion.mdwn

![ikiwiki logo](http://wiki.ondioline.org/ikiwiki.png) The logo I'm using on my ikiwiki installation. -- Paul Collins