From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 15 May 2007 17:22:25 +0000 (+0200)
Subject: Merge branch 'collectd-3.11'
X-Git-Tag: collectd-4.0.0-rc10~28^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3a4405009e53f578c26c22073920cc5b4ffa6eca;p=collectd.git

Merge branch 'collectd-3.11'
---

3a4405009e53f578c26c22073920cc5b4ffa6eca