Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Fri, 11 Oct 2013 00:28:09 +0000 (17:28 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Fri, 11 Oct 2013 00:28:09 +0000 (17:28 -0700)

Trivial merge