From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 5 Jan 2010 10:48:07 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f150642cf243a18f80be1ccdb9bb2ec2bbe4a284;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.9'
---

f150642cf243a18f80be1ccdb9bb2ec2bbe4a284