Merge remote branch 'upstream/master' into prv/po
[ikiwiki] / doc / logo / ikiwiki_old2.png
doc/logo/ikiwiki_old2.png