Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <adefaria@adefaria-lt.audience.local>
Fri, 20 Jun 2014 18:55:52 +0000 (11:55 -0700)
committerAndrew DeFaria <adefaria@adefaria-lt.audience.local>
Fri, 20 Jun 2014 18:55:52 +0000 (11:55 -0700)

Trivial merge