From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 11 Apr 2009 07:34:32 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0~7^2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c57f2a191b63ce73fc432befebe9fa3af97c8eb5;p=collectd.git

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

c57f2a191b63ce73fc432befebe9fa3af97c8eb5