Code

Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:11:20 +0000 (12:11 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 11:11:20 +0000 (12:11 +0100)
commit34f7eda9ad2cbd2cd5620c0a2d76d282e790b4de
tree43b2a61e7ed8948093678649077ef3f695db2599
parent09b9a5ec977f13dc3aee053f01aef3d548efad5d
parent8be9c73cc216609a54a1b997aad8a3d646a0a43f
Merge branch 'collectd-4.8' into collectd-4.9