From: Andrew DeFaria <adefaria@adefaria-lt.audience.local>
Date: Mon, 5 May 2014 18:30:37 +0000 (-0700)
Subject: Merge branch 'master' of defaria.com:/opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=d7db897f8a2e17d38b59af6a880df4fa5df44935;p=clearscm.git

Merge branch 'master' of defaria.com:/opt/git/clearscm

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

d7db897f8a2e17d38b59af6a880df4fa5df44935