Merge branch 'pr/1826'

author Florian Forster <octo@collectd.org>

Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)

committer Florian Forster <octo@collectd.org>

Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
author Florian Forster <octo@collectd.org>
Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
committer Florian Forster <octo@collectd.org>
Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
committer	Florian Forster <octo@collectd.org>
	Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history