From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 7 Feb 2011 07:47:18 +0000 (+0100)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-4.10.3~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ce0118ae5a67654cce06dddc9998dc494beb4251

Merge branch 'collectd-4.9' into collectd-4.10
---

ce0118ae5a67654cce06dddc9998dc494beb4251