From: Florian Forster <octo@collectd.org>
Date: Wed, 28 Sep 2016 13:21:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1952'
X-Git-Tag: collectd-5.7.0~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1961988253c1f5b29a52343a34d291929e84fcf1;p=collectd.git

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

1961988253c1f5b29a52343a34d291929e84fcf1