Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Mon, 7 Apr 2014 22:33:57 +0000 (15:33 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Mon, 7 Apr 2014 22:33:57 +0000 (15:33 -0700)

Trivial merge