Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Tue, 6 Aug 2013 15:15:56 +0000 (08:15 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Tue, 6 Aug 2013 15:15:56 +0000 (08:15 -0700)
commit2c6c91a7c5b064230a5908456963a93b37a19c00
treecb267fcf52bb7bbaedf1583b39136c190deb18d6
parentc44e2bad90e678fec3b8cfc4c4365553a73754be
parent5aa0e96439ba703fef8eccf42f322deaeff5d730
Merge branch 'master' of /opt/git/clearscm

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