Merge branch 'uni/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:45:50 +0000 (11:45 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:45:50 +0000 (11:45 +0200)
commit3d6143a0148f877146aad330cec8d5578b774816
treebbe53f71ea91b9e963cc5edfe416482bf7ab2ff5
parentf0c44c295d16ab49ba6e7e36d8ae9aae78e460f4
parent59d8ed329bdad86d73152c00e9e582f1086cef8b
Merge branch 'uni/collectd-4.0' into collectd-4.0