From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 3 Oct 2008 11:35:56 +0000 (+0200)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~197
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b48454eddeaa6d8e0edb9547190cfc509d8abeb4;p=collectd.git

Merge branch 'collectd-4.5'
---

b48454eddeaa6d8e0edb9547190cfc509d8abeb4