From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 14 Oct 2015 07:10:50 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~590
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7bab45b57d6ef99ae55c499c51478dd63c3b1397;p=collectd.git

Merge branch 'collectd-5.5'
---

7bab45b57d6ef99ae55c499c51478dd63c3b1397