Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
1  2 
src/daemon/utils_cache.c
src/exec.c

Simple merge
diff --cc src/exec.c
Simple merge