Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Tue, 21 Jun 2016 01:46:40 +0000 (18:46 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Tue, 21 Jun 2016 01:46:40 +0000 (18:46 -0700)

Trivial merge