Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)
1  2 
src/processes.c

diff --cc src/processes.c
Simple merge