Merge branch 'master' into next
[ikiwiki] / doc / wikiicons / openidlogin-bg.gif
doc/wikiicons/openidlogin-bg.gif