From: Florian Forster <octo@collectd.org>
Date: Thu, 3 Dec 2015 06:14:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1397'
X-Git-Tag: collectd-5.6.0~532
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1cf372e8b0191b7b340bf3932e21b93d7daf93b;p=collectd.git

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

d1cf372e8b0191b7b340bf3932e21b93d7daf93b