From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 22 Feb 2017 20:09:46 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14d94fb83e1e9487dc46415b4334e7217b9175e9;p=collectd.git

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

14d94fb83e1e9487dc46415b4334e7217b9175e9