Merge branch 'revert'
[ikiwiki] / doc / smileys / smile3.png
doc/smileys/smile3.png