From: collectd bot <32910397+collectd-bot@users.noreply.github.com>
Date: Mon, 20 Nov 2017 11:36:14 +0000 (+0100)
Subject: Auto-Merge pull request #2561 from octo/cid/157643
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6cc0fc256f9e3a5bf0415834c1ecefcc300bab8c;p=collectd.git

Auto-Merge pull request #2561 from octo/cid/157643

Automatically merged due to "Automerge" label
---

6cc0fc256f9e3a5bf0415834c1ecefcc300bab8c