Merge branch 'master' into templatemove
[ikiwiki] / doc / smileys / smile2.png
doc/smileys/smile2.png