Merge branch 'collectd-4.9'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:48:07 +0000 (11:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:48:07 +0000 (11:48 +0100)
commitf150642cf243a18f80be1ccdb9bb2ec2bbe4a284
tree5e2782235addc8a66cf898cadbccbb1bb7b76572
parent8a8f0e97f786efa0d0b0539e1358e92d55c13659
parent9622e4d30f90e9eefca1d43fefc6bf85785074d3
Merge branch 'collectd-4.9'