From: Florian Forster <octo@collectd.org>
Date: Wed, 28 Sep 2016 13:23:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1956'
X-Git-Tag: collectd-5.7.0~66
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=005bf289888e75ad1b35454de5fdd1cb3f2e09fb;p=collectd.git

Merge remote-tracking branch 'github/pr/1956'
---

005bf289888e75ad1b35454de5fdd1cb3f2e09fb