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