Merge remote-tracking branch 'origin/master'
[debian6500.git] / slave
CommitLineData
baa143eb 1master/opt/cluster/slave