Merge branch 'collectd-5.8'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)
commitca6d2f62d82ba4d07d6f266e3abbe1c0230d2f5a
treee8d6d702214beacc147a6a598ce91edd7f4b942c
parentb6af45453fa718f8c3bd57b88cd90298bd52c444
parent0c854759d82a28a5b4c20ad30a97e1b1f23295bc
Merge branch 'collectd-5.8'

Conflicts:
src/collectd.conf.pod
src/collectd.conf.pod