From: Florian Forster <ff@octo.it>
Date: Fri, 16 Dec 2016 18:39:06 +0000 (+0100)
Subject: Auto-Merge pull request #2111 from octo/cid/157643
X-Git-Tag: collectd-5.7.1~12
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7e9462557c1fab6d9c72e58ac5f25952288b883e;p=collectd.git

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

Automatically merged due to "Automerge" label
---

7e9462557c1fab6d9c72e58ac5f25952288b883e