Merge branch 'master' into templatemove
[ikiwiki] / doc / logo / ikiwiki_large.png
doc/logo/ikiwiki_large.png