Merge branch 'master' of defaria.com:/opt/git/clearscm
authorandrew <Andrew@DeFaria.com>
Tue, 11 Nov 2014 15:17:02 +0000 (07:17 -0800)
committerandrew <Andrew@DeFaria.com>
Tue, 11 Nov 2014 15:17:02 +0000 (07:17 -0800)

Trivial merge