Merge branch 'collectd-4.1'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 27 Sep 2007 13:34:13 +0000 (15:34 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 27 Sep 2007 13:34:13 +0000 (15:34 +0200)
commitf3aff73199d94c6eed0dffaeefb5b1b2b6c2c362
tree1fe68ffe0565d00f7697a3174c864dfdd5199801
parent2ac31da827a2823c70ee8ec2058047435de9a3d7
parentc55316847bbd97410e65892b97f022e74bfe9b0f
Merge branch 'collectd-4.1'