From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 19 Aug 2010 13:02:48 +0000 (+0200)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~43
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7;p=collectd.git

Merge branch 'collectd-4.10'
---

d1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7