Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)
1  2 
src/processes.c

diff --cc src/processes.c
Simple merge