Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 6 Jun 2017 08:31:07 +0000 (10:31 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 6 Jun 2017 08:31:07 +0000 (10:31 +0200)
Conflicts:
src/intel_rdt.c


No differences found