Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Sun, 2 Sep 2007 15:55:38 +0000 (17:55 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sun, 2 Sep 2007 15:55:38 +0000 (17:55 +0200)
commit32957f99ace1cb96afbbcebe6a5ae07df0f89013
treed23c284c129466d3ad0df3495b1035ac1f72325d
parentfa7db5e964775dc39e71661884de9f4f8bde7ef6
parent39ab70bc40bb5e68c970b694c52c832ddfd5303a
Merge branch 'pull/collectd-4.0' into collectd-4.0