Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 18 Feb 2008 19:53:54 +0000 (20:53 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 18 Feb 2008 19:53:54 +0000 (20:53 +0100)
commit4cf9eb921f5994d4515613efa8739ce445cfd9a1
tree3eeadbbbb1f3b873c08f9a7e817f567125872186
parentf99cbc5ea9873ce331c27fa698396fdc0cd02d68
parent7ab531887edb3758b6db0fc0c00aa4beee1bc3e2
Merge branch 'collectd-4.2'