Merge branch 'collectd-5.5'

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
diff --cc src/daemon/utils_cache.c
Simple merge
diff --cc src/exec.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
		1	2
src/daemon/utils_cache.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/exec.c	patch \|	diff1 \|	diff2 \|	blob \| history