Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 4 Sep 2008 13:01:06 +0000 (15:01 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 4 Sep 2008 13:01:06 +0000 (15:01 +0200)
commit714644fb443eb2dc8fd8c683cae171caef40cf7a
tree4323f22ab1581f74d6fff697ac1a17c3a695df32
parentd164514834928b3cc5feacb2698b4329fa986b8d
parentdb0ab1056d34e5f77bf47e762b85ec01cf85a2a8
Merge branch 'collectd-4.3' into collectd-4.4