Merge branch 'master' of ssh://defaria.com/opt/git/clearscm