From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 20 Aug 2008 07:21:37 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~64
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=148e8732e45435a051df1c3673cad0d5dc77492f;p=collectd.git

Merge branch 'collectd-4.4'

Conflicts:

	src/collectd.conf.pod
---

148e8732e45435a051df1c3673cad0d5dc77492f