From: Florian Forster <octo@collectd.org>
Date: Tue, 16 Aug 2016 05:30:59 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~124
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3fc7651f7fbfab0ab05e0ea3007e179d2ea67e11;hp=-c;p=collectd.git

Merge branch 'collectd-5.6'
---

3fc7651f7fbfab0ab05e0ea3007e179d2ea67e11