From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 26 Oct 2006 20:33:18 +0000 (+0200)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~61^2~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=444a2bce1161bb09c268f42757fc0fec83990549;p=collectd.git

Merge branch 'collectd-3.10'
---

444a2bce1161bb09c268f42757fc0fec83990549