From: Florian Forster <octo@collectd.org>
Date: Tue, 1 Dec 2015 15:07:44 +0000 (+0100)
Subject: Merge branch 'ff/nagios'
X-Git-Tag: collectd-5.6.0~545
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1729122da5c83da932bbd72cb8c3d4e55b0623d8;p=collectd.git

Merge branch 'ff/nagios'
---

1729122da5c83da932bbd72cb8c3d4e55b0623d8