From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 27 Sep 2007 13:34:00 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.2~2^2~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c55316847bbd97410e65892b97f022e74bfe9b0f;p=collectd.git

Merge branch 'collectd-4.0' into collectd-4.1
---

c55316847bbd97410e65892b97f022e74bfe9b0f