From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 19 Jul 2006 16:51:35 +0000 (+0200)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~73^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ea76bea7a7e7d53960c90779f744830f76adb3e;p=collectd.git

Merge branch 'collectd-3.10'
---

5ea76bea7a7e7d53960c90779f744830f76adb3e