From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 16 Aug 2016 13:00:59 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.0~9
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5236399c4c5483b1a9c21233e34b2b4357800d58;p=collectd.git

Merge branch 'collectd-5.5' into collectd-5.6
---

5236399c4c5483b1a9c21233e34b2b4357800d58