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

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

745ba17db2b2c1868667734d1317e1ee1d0b68ae