Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[ikiwiki] / doc / smileys / icon-error.png
doc/smileys/icon-error.png