Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 12 Jul 2017 16:58:18 +0000 (18:58 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 12 Jul 2017 16:58:18 +0000 (18:58 +0200)
1  2 
src/ipc.c

diff --cc src/ipc.c
Simple merge