Merge branch 'master' of ssh://git.cyclocoop.org/cyclowiki