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

Merge branch 'master-merge' into processes
---

27ffdce9afa964cd33e7e3cd1df0e31fdb8152ff