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