From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Thu, 1 Aug 2013 05:09:55 +0000 (-0700)
Subject: Merge branch 'master' of defaria.com:/opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=770456d66964bcfce681b0190203737b48511541;hp=--cc;p=clearscm.git

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

Conflicts:
	clearadm/log/clearagent.pl.log
	clearadm/var/run/clearagent.pl.pid
---

770456d66964bcfce681b0190203737b48511541