Merge branch 'collectd-5.8'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 16 May 2018 13:19:05 +0000 (15:19 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 16 May 2018 13:19:05 +0000 (15:19 +0200)
commit06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4
treec1f9d90151b054e6be7a23a4e978c6116d4a1303
parent9ae06bc2026e041e937828379daa232d3c0afbf7
parent0d9f395599348e735e6f461e1c328293bef0d060
Merge branch 'collectd-5.8'

Conflicts:
src/ipmi.c
src/ipmi.c