Merge branch 'collectd-5.4' into collectd-5.5

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

Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)

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

Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
diff --cc src/openvpn.c
Simple merge
diff --cc src/processes.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
		1	2
src/openvpn.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history