From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 4 Nov 2006 12:18:06 +0000 (+0100)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~61^2~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9c199c432be4160deb06233fd70420a4568ccf86;p=collectd.git

Merge branch 'collectd-3.10'
---

9c199c432be4160deb06233fd70420a4568ccf86