From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 May 2010 09:00:22 +0000 (+0200)
Subject: Merge branch 'collectd-4.8' into collectd-4.9
X-Git-Tag: collectd-4.10.0~3^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c3533f89f324411112a8b80d7ff0d7afd1e70b5d;p=collectd.git

Merge branch 'collectd-4.8' into collectd-4.9
---

c3533f89f324411112a8b80d7ff0d7afd1e70b5d