Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Thu, 15 Aug 2013 00:11:08 +0000 (17:11 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Thu, 15 Aug 2013 00:11:08 +0000 (17:11 -0700)
commit8589fc0b109a7d29ea6a72cf73c4b8c27e063149
tree0be59c86f581a13dea23b7e678ac5c192b20127f
parent770456d66964bcfce681b0190203737b48511541
parent5aa0e96439ba703fef8eccf42f322deaeff5d730
Merge branch 'master' of defaria.com:/opt/git/clearscm

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