From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 6 Dec 2010 08:31:15 +0000 (+0100)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-5.0.0-beta0~3^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dbcb0610ae7dfa0155b04aa4174ec35a1058d18e;p=collectd.git

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

dbcb0610ae7dfa0155b04aa4174ec35a1058d18e