Merge branch 'master' of andrew@defaria.com:/opt/git/clearscm.git
authoradefaria <adefaria@adefaria-lt.audience.local>
Fri, 14 Nov 2014 03:21:57 +0000 (19:21 -0800)
committeradefaria <adefaria@adefaria-lt.audience.local>
Fri, 14 Nov 2014 03:21:57 +0000 (19:21 -0800)

Trivial merge