Merge branch 'pr/1970'

author Florian Forster <octo@collectd.org>

Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)

committer Florian Forster <octo@collectd.org>

Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
author Florian Forster <octo@collectd.org>
Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
committer Florian Forster <octo@collectd.org>
Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
diff --cc README
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
committer	Florian Forster <octo@collectd.org>
	Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history