Merge branch 'collectd-5.5'

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/processes.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 15 Apr 2016 09:32:49 +0000 (11:32 +0200)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history