Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 07:33:10 +0000 (08:33 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 07:33:10 +0000 (08:33 +0100)
1  2 
src/processes.c

diff --cc src/processes.c
Simple merge