From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 7 Jul 2015 22:29:58 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~85
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=24c2f247f6dc5c17b26d715346a380efababb08f;p=collectd.git

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

24c2f247f6dc5c17b26d715346a380efababb08f