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

Trivial merge