Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[ikiwiki.git] / underlays / smiley / smileys
1 ../../doc/smileys