From: Florian Forster <octo@collectd.org>
Date: Mon, 28 Nov 2016 08:03:12 +0000 (+0100)
Subject: Merge branch 'pr/2056'
X-Git-Tag: collectd-5.7.0~12
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=77ad300d75ce59bf4d49d839a2af72e90590033c;p=collectd.git

Merge branch 'pr/2056'
---

77ad300d75ce59bf4d49d839a2af72e90590033c