From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 11 Aug 2016 15:45:48 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.6.0~3^2~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9d3906a53e086d520b5ed71ca57118e8f589574b;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

9d3906a53e086d520b5ed71ca57118e8f589574b