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