Merge branch 'collectd-5.2' into collectd-5.3

author Florian Forster <octo@collectd.org>

Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)

committer Florian Forster <octo@collectd.org>

Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
author Florian Forster <octo@collectd.org>
Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
committer Florian Forster <octo@collectd.org>
Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
diff --cc configure.in
Simple merge
diff --cc src/rrdcached.c
Simple merge
diff --cc src/rrdtool.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
committer	Florian Forster <octo@collectd.org>
	Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrdcached.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	patch \|	diff1 \|	diff2 \|	blob \| history