Merge branch 'collectd-3.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Oct 2006 15:52:46 +0000 (17:52 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Oct 2006 15:52:46 +0000 (17:52 +0200)
commitbf7d46c94a5913bcdd3eaaaffae7ff88cbac99c8
tree95d5f4170be19966d5cb10da21408befa66bbb99
parente4e51c6605b934c3f5e85f38436ce3e84038595e
parentea985db58c8d53a69fe8e3cc58bb2b181762989d
Merge branch 'collectd-3.10'