From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 11 Feb 2007 14:39:58 +0000 (+0100)
Subject: Merge branch 'collectd-3.11' into merge/collectd-4
X-Git-Tag: collectd-4.0.0~196
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b8be503b2b50366a9c498ba7e4ab66a228c6dfbf;p=collectd.git

Merge branch 'collectd-3.11' into merge/collectd-4

Conflicts:

	src/multimeter.c
	src/plugin.c
---

b8be503b2b50366a9c498ba7e4ab66a228c6dfbf