Merge branch 'collectd-5.5'

author Florian Forster <octo@collectd.org>

Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)

committer Florian Forster <octo@collectd.org>

Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
author Florian Forster <octo@collectd.org>
Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
committer Florian Forster <octo@collectd.org>
Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/daemon/configfile.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
committer	Florian Forster <octo@collectd.org>
	Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history