From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 4 Jan 2011 11:42:23 +0000 (+0100)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0eff156c7816507fa1865b76e948574dd320fae0;p=collectd.git

Merge branch 'collectd-4.10'
---

0eff156c7816507fa1865b76e948574dd320fae0