From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 4 Jan 2011 11:41:51 +0000 (+0100)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-4.10.3~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a24baf2ad70837ea46cacbfee6e03537cf284ad5

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

a24baf2ad70837ea46cacbfee6e03537cf284ad5