From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 12 Jan 2016 13:02:23 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~480
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4d6ff066b1c60a8e6654e4c74370ef951f37b5f3;p=collectd.git

Merge branch 'collectd-5.5'
---

4d6ff066b1c60a8e6654e4c74370ef951f37b5f3