From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 9 May 2009 10:29:44 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37905c5a2370c8e6edae5011978773eeaa589d09;p=collectd.git

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

37905c5a2370c8e6edae5011978773eeaa589d09