Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 12 Jul 2017 16:59:07 +0000 (18:59 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 12 Jul 2017 16:59:07 +0000 (18:59 +0200)
commit267bbc64779f9c7b32e063aac0df22be61bda6ae
tree1571fc915d6dbaeb86c91644ea56c93b5d6d2212
parentbea5daaed7b5cf9160207a95292947873fdcf927
parent01761867ced7bc5fe71546baf350be4a3e800600
Merge branch 'collectd-5.7'

Conflicts:
contrib/systemd.collectd.service
contrib/systemd.collectd.service
src/ipc.c