From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 2 May 2018 10:27:01 +0000 (+0200)
Subject: Merge branch 'collectd-5.8'
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ca6d2f62d82ba4d07d6f266e3abbe1c0230d2f5a

Merge branch 'collectd-5.8'

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

ca6d2f62d82ba4d07d6f266e3abbe1c0230d2f5a