Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
committerFlorian Forster <octo@collectd.org>
Sun, 27 Mar 2011 17:06:47 +0000 (10:06 -0700)
commit8a86b8aadab91e6c8af0210e69fd51a1f6c1056f
tree0e830cca40b2805e18dd7147a25c1d7915651614
parent32ea12c03888fd1f7afc9cfa0519166f5cfad891
parent330e584f3d26d344b7b7e4a1ca1ecb322d8c7ad4
Merge branch 'collectd-5.0'
ChangeLog
src/collectd.conf.pod