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)
Conflicts:
src/collectd.conf.pod

1  2 
src/collectd.conf.pod

Simple merge