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