From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 19 Aug 2008 07:26:13 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.3~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61011a9d336d85890eac845c5af23a8046e74c10;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4
---

61011a9d336d85890eac845c5af23a8046e74c10