Merge branch 'master'
[ikiwiki] / doc / wikiicons / diff.png
doc/wikiicons/diff.png