Merge branch 'master' of file:///srv/git/ikiwiki.info