From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 6 Jun 2017 08:31:07 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~147
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1035fba8812893e50d00a871e3399cc1ece3b384;hp=1035fba8812893e50d00a871e3399cc1ece3b384;p=collectd.git

Merge branch 'collectd-5.7'

Conflicts:
	src/intel_rdt.c
---