From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 3 May 2010 07:48:34 +0000 (+0200)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~121
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=068146351a826b413ea6dedf1c834e31e0ad11f6;p=collectd.git

Merge branch 'collectd-4.10'
---

068146351a826b413ea6dedf1c834e31e0ad11f6