From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 14 Mar 2011 19:06:53 +0000 (+0100)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-4.10.3~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e04cfcb9d1f1eed00bf11768db6d0540babe2e4e;p=collectd.git

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

e04cfcb9d1f1eed00bf11768db6d0540babe2e4e