Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <adefaria@adefaria-lt.audience.local>
Mon, 5 May 2014 18:30:37 +0000 (11:30 -0700)
committerAndrew DeFaria <adefaria@adefaria-lt.audience.local>
Mon, 5 May 2014 18:30:37 +0000 (11:30 -0700)
commitd7db897f8a2e17d38b59af6a880df4fa5df44935
tree0808486d44ed2303500ad5cd60355125f67da452
parent4b00fc25974ad9af6c1de8938b367b25403f40bb
parent8e8e34a5c3dc7ed9571d6df719b04dd87d05f179
Merge branch 'master' of defaria.com:/opt/git/clearscm

Conflicts:
clearadm/etc/conf.d/clearadm.conf