From: Florian Forster <octo@collectd.org>
Date: Fri, 22 Jan 2016 09:53:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=refs%2Ftags%2Fcollectd-5.5.1;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

d5565943cd7ee338e5b750a027faff8115df4c72