From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 4 May 2009 14:57:10 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.0~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ebe3efc7b797546bcae87a946cff1c4cf472919;p=collectd.git

Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	src/filter_chain.c
	src/meta_data.c
	src/target_notification.c
	src/target_replace.c
	src/target_set.c
---

0ebe3efc7b797546bcae87a946cff1c4cf472919