Merge branch 'collectd-5.5'

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

Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)

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

Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
diff --cc src/Makefile.am
Simple merge
diff --cc src/daemon/Makefile.am
Simple merge
diff --cc src/daemon/plugin.c
Simple merge
diff --cc src/daemon/utils_ignorelist.c
Simple merge
diff --cc src/snmp.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/utils_ignorelist.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/snmp.c	patch \|	diff1 \|	diff2 \|	blob \| history