From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 3 Aug 2015 21:29:16 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~620
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=71478cd6550a4e930a1e9b8a906a66579e4e387a;p=collectd.git

Merge branch 'collectd-5.5'
---

71478cd6550a4e930a1e9b8a906a66579e4e387a