Merge branch 'collectd-5.5' into collectd-5.6

author Florian Forster <octo@collectd.org>

Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)

committer Florian Forster <octo@collectd.org>

Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
author Florian Forster <octo@collectd.org>
Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
committer Florian Forster <octo@collectd.org>
Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/battery.c
Simple merge
diff --cc src/powerdns.c
Simple merge
diff --cc src/utils_format_graphite.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
committer	Florian Forster <octo@collectd.org>
	Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/battery.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_format_graphite.c	patch \|	diff1 \|	diff2 \|	blob \| history