From: Florian Forster <octo@collectd.org>
Date: Thu, 18 Jun 2015 11:05:23 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~677
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f995a5d563c2832553b7d172332028811a47db4a;p=collectd.git

Merge branch 'collectd-5.5'
---

f995a5d563c2832553b7d172332028811a47db4a