Merge branch 'master' of ssh://git.wpitchoune.net/srv/git/www