From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 2 Dec 2016 13:01:27 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~295
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2e79fb47c10ffd9efc9532c68fc18a1ad8eaaf61;p=collectd.git

Merge branch 'collectd-5.7'
---

2e79fb47c10ffd9efc9532c68fc18a1ad8eaaf61