Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Tue, 21 Jan 2014 21:52:55 +0000 (13:52 -0800)
committerAndrew DeFaria <Andrew@DeFaria.com>
Tue, 21 Jan 2014 21:52:55 +0000 (13:52 -0800)

Trivial merge