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

Merge branch 'collectd-3.10'
---

dfe12aadb65933d7dd15d5e42d3c6218900bed15