From: Florian Forster <octo@collectd.org>
Date: Tue, 1 Dec 2015 19:23:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1370'
X-Git-Tag: collectd-5.6.0~543
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5e0906a2afdd7a41fb9635190dc4427993c34e5c;p=collectd.git

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

5e0906a2afdd7a41fb9635190dc4427993c34e5c