Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Fri, 2 Aug 2013 20:01:52 +0000 (13:01 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Fri, 2 Aug 2013 20:01:52 +0000 (13:01 -0700)

Trivial merge