Merge branch 'master' of ssh://defaria.com/opt/git/clearscm
authorAndrew DeFaria <adefaria@audience.local>
Tue, 4 Aug 2015 20:07:50 +0000 (13:07 -0700)
committerAndrew DeFaria <adefaria@audience.local>
Tue, 4 Aug 2015 20:07:50 +0000 (13:07 -0700)

Trivial merge