Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 08:16:40 +0000 (10:16 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 08:16:40 +0000 (10:16 +0200)
commit5a4daa815531077fdf8b3e425b92f88fa0abb42a
tree8e206759323f79e26e2942de8eaa0cc9d68b1abd
parentf21223850375057ea74f9e9f4feed264d98c8a78
parent0384380080a39adb252a4d5dd3a6bf5c27f8faf8
Merge branch 'collectd-4.8'