From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Apr 2008 12:04:55 +0000 (+0200)
Subject: Merge branch 'collectd-4.3'
X-Git-Tag: collectd-4.4.0~35
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=917343b099777d5aae031c5062b01e4d3a694b5a

Merge branch 'collectd-4.3'
---

917343b099777d5aae031c5062b01e4d3a694b5a