From: Florian Forster <octo@collectd.org>
Date: Wed, 17 Jun 2015 07:12:38 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~682
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=77243847767b4bc2ea6600a5f88ef45f2a8ec713;p=collectd.git

Merge branch 'collectd-5.5'
---

77243847767b4bc2ea6600a5f88ef45f2a8ec713