From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 22 Mar 2008 08:40:00 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.2~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=4f2642f86673329db9f8cf30854bf39bbdc4c2b2;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3
---

4f2642f86673329db9f8cf30854bf39bbdc4c2b2