From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 22 Oct 2006 15:52:46 +0000 (+0200)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~70
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=bf7d46c94a5913bcdd3eaaaffae7ff88cbac99c8;p=collectd.git

Merge branch 'collectd-3.10'
---

bf7d46c94a5913bcdd3eaaaffae7ff88cbac99c8