From: Florian Forster <octo@collectd.org>
Date: Fri, 16 Nov 2012 06:53:27 +0000 (+0100)
Subject: Merge branch 'sh/plugin_interval'
X-Git-Tag: collectd-5.2.0~20
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6d85a198dd90fb5af963ad847d9dbff7b8025c46;hp=6d85a198dd90fb5af963ad847d9dbff7b8025c46;p=collectd.git

Merge branch 'sh/plugin_interval'

Conflicts:
	src/amqp.c
	src/exec.c
	src/memcached.c
	src/unixsock.c
---