From: Florian Forster <octo@collectd.org>
Date: Fri, 11 Nov 2016 20:24:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1967'
X-Git-Tag: collectd-5.7.0~35
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=78e4df368cd6fd548427d52ecd288c96e2029ce6;p=collectd.git

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

78e4df368cd6fd548427d52ecd288c96e2029ce6