Merge branch 'master' into comments
[ikiwiki] / doc / logo / ikiwiki_old.png
doc/logo/ikiwiki_old.png