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