From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 10 Jun 2008 15:10:05 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~122
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=430b0b4d0275f7fea64376fc166e81fc0bcc36bf;p=collectd.git

Merge branch 'collectd-4.4'
---

430b0b4d0275f7fea64376fc166e81fc0bcc36bf