Merge pull request #2598 from octo/ff/delayacct

author Florian Forster <ff@octo.it>

Fri, 8 Dec 2017 18:51:50 +0000 (19:51 +0100)

committer GitHub <noreply@github.com>

Fri, 8 Dec 2017 18:51:50 +0000 (19:51 +0100)
author Florian Forster <ff@octo.it>
Fri, 8 Dec 2017 18:51:50 +0000 (19:51 +0100)
committer GitHub <noreply@github.com>
Fri, 8 Dec 2017 18:51:50 +0000 (19:51 +0100)
diff --cc Makefile.am
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	Florian Forster <ff@octo.it>
	Fri, 8 Dec 2017 18:51:50 +0000 (19:51 +0100)
committer	GitHub <noreply@github.com>
	Fri, 8 Dec 2017 18:51:50 +0000 (19:51 +0100)
		1	2
Makefile.am	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