From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 5 Mar 2017 17:36:02 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~213
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3e0dd5070e385b864c771902bfa4c6331c5710b4;p=collectd.git

Merge branch 'collectd-5.7'

Conflicts:
	contrib/redhat/collectd.spec
---

3e0dd5070e385b864c771902bfa4c6331c5710b4