From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 6 Jul 2008 13:04:41 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.2~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a8d1499f57d3ffaff4c0ef3259a9fbf21b2953c5;hp=a8d1499f57d3ffaff4c0ef3259a9fbf21b2953c5;p=collectd.git

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