Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 08:16:35 +0000 (10:16 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 08:16:35 +0000 (10:16 +0200)
commit0384380080a39adb252a4d5dd3a6bf5c27f8faf8
treef561a28b7198040f79169b2a69a7fc70aa830f6b
parent4374305bd9523620d4291c9be5bfd81640f789a7
parent84014b619d09bd1091724a4086222954e8c2450a
Merge branch 'collectd-4.7' into collectd-4.8