From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 24 Jun 2007 20:42:09 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~43
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=dd13e59199e95dfa5421ca33907c0cccc75e550c

Merge branch 'collectd-4.0'
---

dd13e59199e95dfa5421ca33907c0cccc75e550c