Merge branch 'master' of git://git.pipapo.org/webgit