From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 7 Aug 2015 08:14:59 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~616
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=06efe4f50bbdfbade922b8a3ee4576eb2cc4562c;p=collectd.git

Merge branch 'collectd-5.5'
---

06efe4f50bbdfbade922b8a3ee4576eb2cc4562c