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

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

c15dbfc3739f7c3bbd8171797eaef55749008bfa