Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew <Andrew@ClearSCM.com>
Sun, 6 Apr 2014 07:00:13 +0000 (00:00 -0700)
committerAndrew <Andrew@ClearSCM.com>
Sun, 6 Apr 2014 07:00:13 +0000 (00:00 -0700)

Trivial merge