From: Florian Forster <octo@collectd.org>
Date: Fri, 19 Jun 2015 18:08:24 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~674
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;ds=sidebyside;h=72a8fd43dcf55cbc9a65a5530c232322c0d686af;p=collectd.git

Merge branch 'collectd-5.5'
---

72a8fd43dcf55cbc9a65a5530c232322c0d686af