Merge branch 'master' of ssh://defaria.com/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Wed, 23 Oct 2013 16:01:15 +0000 (09:01 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Wed, 23 Oct 2013 16:01:15 +0000 (09:01 -0700)

Trivial merge