From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 23 Feb 2008 09:58:00 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.2.5~15
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7237c726f589df921a26d6951c2d1bf853580c43;p=collectd.git

Merge branch 'collectd-4.1' into collectd-4.2
---

7237c726f589df921a26d6951c2d1bf853580c43