Merge branch 'master' of defaria.com:/opt/git/clearscm
authorandrew <Andrew@DeFaria.com>
Fri, 20 Mar 2015 16:33:46 +0000 (09:33 -0700)
committerandrew <Andrew@DeFaria.com>
Fri, 20 Mar 2015 16:33:46 +0000 (09:33 -0700)

Trivial merge