From: collectd bot <32910397+collectd-bot@users.noreply.github.com>
Date: Tue, 19 Jun 2018 11:57:21 +0000 (+0200)
Subject: Auto-Merge pull request #2826 from rpv-tomsk/collectd-master
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0a18c82ec8c41db8eea0fd2cf55f44bdab6e0137;p=collectd.git

Auto-Merge pull request #2826 from rpv-tomsk/collectd-master

Automatically merged due to "Automerge" label
---

0a18c82ec8c41db8eea0fd2cf55f44bdab6e0137