Merge branch 'master', remote-tracking branch 'joey/master'
[ikiwiki] / doc / smileys / smile.png
doc/smileys/smile.png