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