Merge branch 'collectd-4.3'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Feb 2008 07:30:28 +0000 (08:30 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Feb 2008 07:30:28 +0000 (08:30 +0100)
commite390e8d4b386894f36b95d12311c018d7644fc76
tree46b28fd835df0da78b78e872bb89034696fa7ed8
parent8757d92e53f16bf360d1410b70d9511bd154cea3
parentd5272dbabf4c7a47f34066c05f479523d7b8beae
Merge branch 'collectd-4.3'