Merge branch 'collectd-5.5'

author Marc Fournier <marc.fournier@camptocamp.com>

Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)

committer Marc Fournier <marc.fournier@camptocamp.com>

Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/pf.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/pf.c	patch \|	diff1 \|	diff2 \|	blob \| history