From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 19 Feb 2017 11:59:13 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~18
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f7e2d82c4d016df72c55e85bb9c5bc9ba08d5f91;p=collectd.git

Merge branch 'collectd-5.6' into collectd-5.7
---

f7e2d82c4d016df72c55e85bb9c5bc9ba08d5f91