Merge branch 'collectd-5.2'

author Florian Forster <octo@collectd.org>

Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)

committer Florian Forster <octo@collectd.org>

Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
author Florian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
committer Florian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
diff --cc src/apcups.c
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
committer	Florian Forster <octo@collectd.org>
	Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
		1	2
src/apcups.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history