Merge branch 'master' of defaria.com:/opt/git/clearscm
authorandrew <Andrew@DeFaria.com>
Tue, 13 May 2014 04:20:20 +0000 (21:20 -0700)
committerandrew <Andrew@DeFaria.com>
Tue, 13 May 2014 04:20:20 +0000 (21:20 -0700)

Trivial merge