Code

Merge branch 'collectd-4.9'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:54:52 +0000 (11:54 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:54:52 +0000 (11:54 +0100)
commit13da81f864686e51b41a088edb63fd47d57806bd
treec3493d5a3ea064cd073709162abf7f53db661447
parentf150642cf243a18f80be1ccdb9bb2ec2bbe4a284
parent3ae8778a363fc4383f1135ae99b389fad96978f3
Merge branch 'collectd-4.9'