From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Tue, 6 Aug 2013 15:15:56 +0000 (-0700)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=2c6c91a7c5b064230a5908456963a93b37a19c00;p=clearscm.git

Merge branch 'master' of /opt/git/clearscm

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

2c6c91a7c5b064230a5908456963a93b37a19c00