Merge branch 'master' of defaria.com:/opt/git/clearscm
authorandrew <Andrew@DeFaria.com>
Wed, 11 Jun 2014 06:05:42 +0000 (23:05 -0700)
committerandrew <Andrew@DeFaria.com>
Wed, 11 Jun 2014 06:05:42 +0000 (23:05 -0700)

Trivial merge