From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 4 May 2009 17:12:00 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0~7^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c01301e8a69b8d53b06b522b107c97dcb65093ad;p=collectd.git

Merge branch 'collectd-4.5' into collectd-4.6
---

c01301e8a69b8d53b06b522b107c97dcb65093ad