Merge branch 'pull/collectd-4.1' into collectd-4.1 collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)
commitbd21265ce20def847ceb4b0f90330f25a91522bf
treecf19462fa9762fec44cac9c80ee574e5a24dd5b7
parentb5c5890955fa19651ad8b3f48d99364d270a0d8f
parentb4f0540b8931a0eff2712709ba39b35ffb626969
Merge branch 'pull/collectd-4.1' into collectd-4.1