From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 17 Aug 2010 16:53:38 +0000 (+0200)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~49
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b53110ef99e3d6a5e2f8e79b8f068cfe96a1accb;p=collectd.git

Merge branch 'collectd-4.10'
---

b53110ef99e3d6a5e2f8e79b8f068cfe96a1accb