Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Thu, 15 Aug 2013 00:17:39 +0000 (17:17 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Thu, 15 Aug 2013 00:17:39 +0000 (17:17 -0700)

Trivial merge