From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 19 Mar 2016 15:44:30 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~378
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a82395b57384541152423862bcf44c0db7789641;p=collectd.git

Merge branch 'collectd-5.5'
---

a82395b57384541152423862bcf44c0db7789641