Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Thu, 1 Aug 2013 05:05:40 +0000 (22:05 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Thu, 1 Aug 2013 05:05:40 +0000 (22:05 -0700)
commit2416f3dcb9c90f552302ee5c4cf608fd9a7f3683
treecce0ef8b6c1b685a8042f7a14264bde52a8a8220
parent1baa2540e98d513aefdafc868bcb7ee830037b5a
parent4485a622887eafc6174b305983301aa6ea46d4c9
Merge branch 'master' of /opt/git/clearscm

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