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