From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 14 Sep 2015 08:58:22 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~593
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d6f0273b2ebae6995d69c7701838825b96e4f424;p=collectd.git

Merge branch 'collectd-5.5'
---

d6f0273b2ebae6995d69c7701838825b96e4f424