Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:00:30 +0000 (17:00 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:00:30 +0000 (17:00 +0100)
1  2 
src/processes.c

diff --cc src/processes.c
Simple merge