Merge remote-tracking branch 'schmonz/cvs'
[ikiwiki] / doc / wikiicons / diff.png
doc/wikiicons/diff.png