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

Merge branch 'collectd-4.6' into collectd-4.7
---

f71895576cbd4b488cd66f0c96efb6fd3e7a6faf