From: Florian Forster <ff@octo.it>
Date: Sat, 17 Dec 2016 10:39:08 +0000 (+0100)
Subject: Auto-Merge pull request #2053 from nuclearcat/master
X-Git-Tag: collectd-5.8.0~265
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d2bd6ba8ae2dac6f13040eca06c765e598cf2e3a;p=collectd.git

Auto-Merge pull request #2053 from nuclearcat/master

Automatically merged due to "Automerge" label
---

d2bd6ba8ae2dac6f13040eca06c765e598cf2e3a