Merge branch 'collectd-5.7'

author Florian Forster <octo@collectd.org>

Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)

committer Florian Forster <octo@collectd.org>

Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
author Florian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
committer Florian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
diff --cc src/daemon/common.c
Simple merge
diff --cc src/daemon/configfile.c
Simple merge
diff --cc src/netapp.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
committer	Florian Forster <octo@collectd.org>
	Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
		1	2
src/daemon/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/netapp.c	patch \|	diff1 \|	diff2 \|	blob \| history