From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 14 Mar 2011 19:08:24 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.0~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=50c6b81549e3239034f71f00ff7dde4c6a8767e5

Merge branch 'collectd-4.10' into collectd-5.0
---

50c6b81549e3239034f71f00ff7dde4c6a8767e5