From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 21 Apr 2007 09:39:33 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4' into collectd-4
X-Git-Tag: collectd-4.0.0~71
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=fde47df2296257971379297ff6831d887e0acd39;p=collectd.git

Merge branch 'pull/collectd-4' into collectd-4
---

fde47df2296257971379297ff6831d887e0acd39