Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Sat, 5 Apr 2014 04:49:49 +0000 (21:49 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Sat, 5 Apr 2014 04:49:49 +0000 (21:49 -0700)

Trivial merge