Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Apr 2007 14:16:27 +0000 (16:16 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Apr 2007 14:16:27 +0000 (16:16 +0200)
commitd9256059b2a356625feabe5bb44539eef0660d5a
tree9bdc9e8fe2c7738a140deb12caf7cf540f69c227
parent3066c1bb4905e1d40c197a921f7ef5ca69fdca4a
parenta6ce2a7be1c651cba36b73b269f792f16425aec7
Merge branch 'pull/collectd-4' into collectd-4