From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 22 Aug 2016 20:13:13 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~120
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8313250e5fdc28c9f01b5bc94211fe0e7a8f023e;p=collectd.git

Merge branch 'collectd-5.6'
---

8313250e5fdc28c9f01b5bc94211fe0e7a8f023e