svn merge -r523:547 branches/config-step trunk
[collectd.git] / contrib / collectd.conf
2006-03-13 tokkeeAdded vserver to collectd.conf ;-)
2006-01-17 octoAdded sample collectd.conf