From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 4 Sep 2008 13:01:06 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.5.0~2^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=714644fb443eb2dc8fd8c683cae171caef40cf7a;hp=714644fb443eb2dc8fd8c683cae171caef40cf7a;p=collectd.git

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