Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Sun, 17 Jul 2016 00:54:32 +0000 (17:54 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Sun, 17 Jul 2016 00:54:32 +0000 (17:54 -0700)

Trivial merge