Merge branch 'collectd-5.6' into collectd-5.7

author Florian Forster <octo@collectd.org>

Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)

committer Florian Forster <octo@collectd.org>

Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
author Florian Forster <octo@collectd.org>
Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
committer Florian Forster <octo@collectd.org>
Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/bind.c
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
committer	Florian Forster <octo@collectd.org>
	Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/bind.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history