From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 27 Sep 2007 13:34:13 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~57
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f3aff73199d94c6eed0dffaeefb5b1b2b6c2c362;p=collectd.git

Merge branch 'collectd-4.1'
---

f3aff73199d94c6eed0dffaeefb5b1b2b6c2c362