Merge branch 'master' of ssh://doumenc.org/home/web/sites/git/config