From: Florian Forster <octo@collectd.org>
Date: Thu, 18 Jun 2015 14:55:53 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~676
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1b15b227585497f72ab0e42d96d79c0313323bd4;hp=--cc;p=collectd.git

Merge branch 'collectd-5.5'
---

1b15b227585497f72ab0e42d96d79c0313323bd4