Merge branch 'pr/846'

author Florian Forster <octo@collectd.org>

Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)

committer Florian Forster <octo@collectd.org>

Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
author Florian Forster <octo@collectd.org>
Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
committer Florian Forster <octo@collectd.org>
Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
committer	Florian Forster <octo@collectd.org>
	Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history