Merge pull request #3204 from pticon/master

author Dagobert Michelsen <dam@opencsw.org>

Tue, 25 Feb 2020 10:23:54 +0000 (11:23 +0100)

committer GitHub <noreply@github.com>

Tue, 25 Feb 2020 10:23:54 +0000 (11:23 +0100)
author Dagobert Michelsen <dam@opencsw.org>
Tue, 25 Feb 2020 10:23:54 +0000 (11:23 +0100)
committer GitHub <noreply@github.com>
Tue, 25 Feb 2020 10:23:54 +0000 (11:23 +0100)
diff --cc Makefile.am
Simple merge
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Dagobert Michelsen <dam@opencsw.org>
	Tue, 25 Feb 2020 10:23:54 +0000 (11:23 +0100)
committer	GitHub <noreply@github.com>
	Tue, 25 Feb 2020 10:23:54 +0000 (11:23 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history