Merge branch 'master' of ssh://defaria.com/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Sat, 7 Dec 2013 04:05:04 +0000 (20:05 -0800)
committerAndrew DeFaria <Andrew@DeFaria.com>
Sat, 7 Dec 2013 04:05:04 +0000 (20:05 -0800)

Trivial merge