Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Thu, 1 Aug 2013 05:09:55 +0000 (22:09 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Thu, 1 Aug 2013 05:09:55 +0000 (22:09 -0700)
commit770456d66964bcfce681b0190203737b48511541
tree9c5aacd108d7af2ed7d54eccc5bacc84a09c5de5
parentb7cc317e6f10ddb4b66c81a5cb4d03af929051f8
parent4485a622887eafc6174b305983301aa6ea46d4c9
Merge branch 'master' of defaria.com:/opt/git/clearscm

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