Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew <Andrew@ClearSCM.com>
Wed, 11 Jun 2014 06:49:10 +0000 (23:49 -0700)
committerAndrew <Andrew@ClearSCM.com>
Wed, 11 Jun 2014 06:49:10 +0000 (23:49 -0700)

Trivial merge