Merge branch 'collectd-5.1' into collectd-5.2

author Florian Forster <octo@collectd.org>

Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)

committer Florian Forster <octo@collectd.org>

Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
author Florian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
committer Florian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
diff --cc src/exec.c
Simple merge
diff --cc src/plugin.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
committer	Florian Forster <octo@collectd.org>
	Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)
		1	2
src/exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history