From: Florian Forster <octo@verplant.org>
Date: Sat, 17 Jun 2006 18:15:23 +0000 (+0200)
Subject: Merge branch 'master' into processes
X-Git-Tag: collectd-3.11.0~76^2~15
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=73f68e879976ecee72dba83317e2d015cdf65467;p=collectd.git

Merge branch 'master' into processes
---

73f68e879976ecee72dba83317e2d015cdf65467