From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 20 Jun 2010 16:02:39 +0000 (+0200)
Subject: Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
X-Git-Tag: collectd-4.10.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96c474f576c721c6d993025b99c55de375552259;p=collectd.git

Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
---

96c474f576c721c6d993025b99c55de375552259