Merge remote branch 'smcv/ready/localurl'
[ikiwiki] / doc / smileys / smile2.png
doc/smileys/smile2.png